gnome 2.8 commit

2 files changed, 29 insertions, 0 deletions

diff --git a/x11-libs/pango/files/digest-pango-1.6.0 b/x11-libs/pango/files/digest-pango-1.6.0
new file mode 100644
index 000000000000..640caec01a5b
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.6.0
@@ -0,0 +1 @@
+MD5 6c732bbc5fba5a0f1f8086e8aa4f490d pango-1.6.0.tar.bz2 951911
diff --git a/x11-libs/pango/files/pango-1.6.0-cjk_space_as_char.patch b/x11-libs/pango/files/pango-1.6.0-cjk_space_as_char.patch
new file mode 100644
index 000000000000..a258b98a495f
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.6.0-cjk_space_as_char.patch
@@ -0,0 +1,28 @@
+Index: pango/pango-context.c
+===================================================================
+RCS file: /cvs/gnome/pango/pango/pango-context.c,v
+retrieving revision 1.71
+diff -u -p -r1.71 pango-context.c
+--- pango/pango-context.c	10 Jul 2004 21:41:37 -0000	1.71
++++ pango/pango-context.c	13 Sep 2004 14:24:49 -0000
+@@ -1057,7 +1057,19 @@ itemize_state_process_run (ItemizeState 
+       PangoEngineShape *shape_engine;
+       PangoFont *font;
+ 
+-      if (!g_unichar_isgraph (wc))
++      /* 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.
++       * To make this really work well, we'd need to emulate missing
++       * space characters, which we don't yet do, so we sometimes
++       * will get hex boxes.
++       *
++       * The exception of U+3000 (IDEOGRAPHIC SPACE) here is because we
++       * want to choose an ideographic space that matches ideographic text
++       * in cell width. Even if we were emulating missing spaces, an
++       * emulated ideographic space for the primary font wouldn't be the
++       * right size.
++       */
++      if (!g_unichar_isgraph (wc) && wc != 0x3000)
+ 	{
+ 	  shape_engine = NULL;
+ 	  font = NULL;