[maemo-commits] [maemo-commits] r19490 - in projects/haf/trunk/pango1.0/debian: . patches

[From: subversion at stage.maemo.org]

Author: kalikiana
Date: 2009-11-10 16:00:57 +0200 (Tue, 10 Nov 2009)
New Revision: 19490

Added:
   projects/haf/trunk/pango1.0/debian/patches/no-ellipsis-1.24.2.patch
Modified:
   projects/haf/trunk/pango1.0/debian/changelog
Log:
pango1.0 (1.24.2-0maemo3) unstable; urgency=low

  * Fixes: NB#110963 Do not display "..." when label is ellipsized
  * debian/patches/no-ellipsis-1.24.2.patch: use a zero-width space in place of
    periods for ellipsized text.

 -- Christian Dywan <christian at lanedo.com>  Tue, 10 Nov 2009 14:49:11 +0100

Modified: projects/haf/trunk/pango1.0/debian/changelog
===================================================================
--- projects/haf/trunk/pango1.0/debian/changelog	2009-11-10 13:47:47 UTC (rev 19489)
+++ projects/haf/trunk/pango1.0/debian/changelog	2009-11-10 14:00:57 UTC (rev 19490)
@@ -1,3 +1,11 @@
+pango1.0 (1.24.2-0maemo3) unstable; urgency=low
+
+  * Fixes: NB#110963 Do not display "..." when label is ellipsized
+  * debian/patches/no-ellipsis-1.24.2.patch: use a zero-width space in place of
+    periods for ellipsized text.
+
+ -- Christian Dywan <christian at lanedo.com>  Tue, 10 Nov 2009 14:49:11 +0100
+
 pango1.0 (1.24.2-0maemo2) unstable; urgency=low
 
   * updated build dependencies

Added: projects/haf/trunk/pango1.0/debian/patches/no-ellipsis-1.24.2.patch
===================================================================
--- projects/haf/trunk/pango1.0/debian/patches/no-ellipsis-1.24.2.patch	2009-11-10 13:47:47 UTC (rev 19489)
+++ projects/haf/trunk/pango1.0/debian/patches/no-ellipsis-1.24.2.patch	2009-11-10 14:00:57 UTC (rev 19490)
@@ -0,0 +1,27 @@
+diff --git a/pango/ellipsize.c b/pango/ellipsize.c
+index 3a39a78..f1574bf 100644
+--- a/pango/ellipsize.c
++++ b/pango/ellipsize.c
+@@ -334,7 +334,9 @@ shape_ellipsis (EllipsizeState *state)
+ 
+   /* First try using a specific ellipsis character in the best matching font
+    */
+-  if (state->ellipsis_is_cjk)
++  if (state->layout->ellipsize != PANGO_ELLIPSIZE_MIDDLE)
++    ellipsis_text = "\342\200\213";	/* U+200B: ZERO WIDTH SPACE */
++  else if (state->ellipsis_is_cjk)
+     ellipsis_text = "\342\213\257";	/* U+22EF: MIDLINE HORIZONTAL ELLIPSIS, used for CJK */
+   else
+     ellipsis_text = "\342\200\246";	/* U+2026: HORIZONTAL ELLIPSIS */
+@@ -353,7 +355,10 @@ shape_ellipsis (EllipsizeState *state)
+        */
+       ((PangoAttrInt *)fallback)->value = TRUE;
+ 
+-      ellipsis_text = "...";
++      if (state->layout->ellipsize != PANGO_ELLIPSIZE_MIDDLE)
++        ellipsis_text = " ";
++      else
++        ellipsis_text = "...";
+       item = itemize_text (state, ellipsis_text, attrs);
+     }
+