summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-08-22 23:29:09 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-08-22 23:29:09 +0000
commit2a59f9329e5579055f9ac561f2e6d0d334d3d149 (patch)
treea4402ce79262194826178ddb3d45def77fa5683d
parentb865a622e2fc2085a6a908065509e00d306350b4 (diff)
downloadpango-2a59f9329e5579055f9ac561f2e6d0d334d3d149.tar.gz
Replace (!isgraph && !isspace) with (!isprint) which is equivalent. Also,
2006-08-22 Behdad Esfahbod <behdad@gnome.org> * pango/pango-context.c (itemize_state_process_run): Replace (!isgraph && !isspace) with (!isprint) which is equivalent. Also, update comments.
-rw-r--r--ChangeLog8
-rw-r--r--pango/pango-context.c11
2 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 07329fef..43cc5579 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-08-22 Behdad Esfahbod <behdad@gnome.org>
+ * pango/pango-context.c (itemize_state_process_run): Replace (!isgraph
+ && !isspace) with (!isprint) which is equivalent. Also, update
+ comments.
+
+2006-08-22 Behdad Esfahbod <behdad@gnome.org>
+
+ Part of Bug 145275 – Font selection for space characters
+
* pango/pango-context.c (itemize_state_process_run): Find shaper/font
for Private Use and space characters too. Finding shaper for Private
Use is needed for any practical use of those areas. Ideally, spaces
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 51d709b4..43a14b69 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -1081,7 +1081,9 @@ itemize_state_process_run (ItemizeState *state)
PangoFont *font;
/* We don't want space characters to affect font selection; in general,
- * it's always wrong to select a font just to render a space.
+ * it's always wrong to select a font just to render a space. But until
+ * we have a better solution, choosing a font for spaces seems to work
+ * better.
*
* The exception of U+3000 (IDEOGRAPHIC SPACE) here is because we
* want to choose an ideographic space that matches ideographic text
@@ -1092,8 +1094,11 @@ itemize_state_process_run (ItemizeState *state)
* The exception of PrivateUse characters is indeed necessary to be
* able to render any of them.
*/
- if (G_UNLIKELY (!g_unichar_isgraph (wc) &&
- !g_unichar_isspace (wc) /*wc != 0x3000*/ &&
+ /*
+ if (G_UNLIKELY (!g_unichar_isgraph (wc) && wc != 0x3000 &&
+ g_unichar_type (wc) != G_UNICODE_PRIVATE_USE))
+ */
+ if (G_UNLIKELY (!g_unichar_isprint (wc) &&
g_unichar_type (wc) != G_UNICODE_PRIVATE_USE))
{
shape_engine = NULL;