From 6b78072f12a63f2a48a81a08baae812b539df8ee Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 15 Jul 2004 14:50:57 +0000 Subject: Replace non-breaking-space with a normal space before looking it up. Thu Jul 15 10:48:01 2004 Owen Taylor * pango/pangofc-font.c (pango_fc_font_get_glyph): Replace non-breaking-space with a normal space before looking it up. (Inspired by http://bugzilla.ximian.com/show_bug.cgi?id=60549) --- ChangeLog | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-6 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ pango/pangofc-font.c | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/ChangeLog b/ChangeLog index 61ad0acc..63b711fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jul 15 10:48:01 2004 Owen Taylor + + * pango/pangofc-font.c (pango_fc_font_get_glyph): Replace + non-breaking-space with a normal space before looking it up. + (Inspired by http://bugzilla.ximian.com/show_bug.cgi?id=60549) + Wed Jul 14 17:47:38 2004 Owen Taylor * pango/pango-layout.[ch] pango/ellipsize.c pango/Makefile.am: diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 61ad0acc..63b711fb 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Thu Jul 15 10:48:01 2004 Owen Taylor + + * pango/pangofc-font.c (pango_fc_font_get_glyph): Replace + non-breaking-space with a normal space before looking it up. + (Inspired by http://bugzilla.ximian.com/show_bug.cgi?id=60549) + Wed Jul 14 17:47:38 2004 Owen Taylor * pango/pango-layout.[ch] pango/ellipsize.c pango/Makefile.am: diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 61ad0acc..63b711fb 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Thu Jul 15 10:48:01 2004 Owen Taylor + + * pango/pangofc-font.c (pango_fc_font_get_glyph): Replace + non-breaking-space with a normal space before looking it up. + (Inspired by http://bugzilla.ximian.com/show_bug.cgi?id=60549) + Wed Jul 14 17:47:38 2004 Owen Taylor * pango/pango-layout.[ch] pango/ellipsize.c pango/Makefile.am: diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 61ad0acc..63b711fb 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Thu Jul 15 10:48:01 2004 Owen Taylor + + * pango/pangofc-font.c (pango_fc_font_get_glyph): Replace + non-breaking-space with a normal space before looking it up. + (Inspired by http://bugzilla.ximian.com/show_bug.cgi?id=60549) + Wed Jul 14 17:47:38 2004 Owen Taylor * pango/pango-layout.[ch] pango/ellipsize.c pango/Makefile.am: diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 20772d8c..7c373c2d 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -545,6 +545,12 @@ pango_fc_font_get_glyph (PangoFcFont *font, g_return_val_if_fail (PANGO_IS_FC_FONT (font), 0); + /* Replace NBSP with a normal space; it should be invariant that + * they shape the same other than breaking properties. + */ + if (wc == 0xA0) + wc = 0x20; + if (priv->decoder) return pango_fc_decoder_get_glyph (priv->decoder, font, wc); -- cgit v1.2.1