From f648d7729187c5451cdad5f03727cfc57abb0df8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 13 Feb 2004 16:27:52 +0000 Subject: Reapply the patch from #124175 that somehow got reverted. Mon Jan 26 10:30:06 2004 Owen Taylor * pango/modules/thai/thai-shaper.c: Reapply the patch from #124175 that somehow got reverted. --- ChangeLog | 7 ++++++- ChangeLog.pre-1-10 | 7 ++++++- ChangeLog.pre-1-4 | 7 ++++++- ChangeLog.pre-1-6 | 7 ++++++- ChangeLog.pre-1-8 | 7 ++++++- modules/thai/thai-shaper.c | 21 +++++---------------- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index d85c688a..c270ebe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 26 10:30:06 2004 Owen Taylor + + * pango/modules/thai/thai-shaper.c: Reapply the patch + from #124175 that somehow got reverted. + Fri Feb 13 10:54:18 2004 Owen Taylor Memory leak fixes from Masatake YAMATO, #130652 @@ -88,7 +93,7 @@ Mon Jan 26 14:20:34 2004 Owen Taylor Mon Jan 26 10:30:06 2004 Owen Taylor - * pango/modules/thai/thai-c: Fix up glyph addition + * pango/modules/thai/thai-shaper.c: Fix up glyph addition code so that it works properly with the typical TrueType fonts that have 0 width for combining characters. (#124175, Theppitak Karoonboonyanan) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d85c688a..c270ebe5 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Mon Jan 26 10:30:06 2004 Owen Taylor + + * pango/modules/thai/thai-shaper.c: Reapply the patch + from #124175 that somehow got reverted. + Fri Feb 13 10:54:18 2004 Owen Taylor Memory leak fixes from Masatake YAMATO, #130652 @@ -88,7 +93,7 @@ Mon Jan 26 14:20:34 2004 Owen Taylor Mon Jan 26 10:30:06 2004 Owen Taylor - * pango/modules/thai/thai-c: Fix up glyph addition + * pango/modules/thai/thai-shaper.c: Fix up glyph addition code so that it works properly with the typical TrueType fonts that have 0 width for combining characters. (#124175, Theppitak Karoonboonyanan) diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d85c688a..c270ebe5 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Mon Jan 26 10:30:06 2004 Owen Taylor + + * pango/modules/thai/thai-shaper.c: Reapply the patch + from #124175 that somehow got reverted. + Fri Feb 13 10:54:18 2004 Owen Taylor Memory leak fixes from Masatake YAMATO, #130652 @@ -88,7 +93,7 @@ Mon Jan 26 14:20:34 2004 Owen Taylor Mon Jan 26 10:30:06 2004 Owen Taylor - * pango/modules/thai/thai-c: Fix up glyph addition + * pango/modules/thai/thai-shaper.c: Fix up glyph addition code so that it works properly with the typical TrueType fonts that have 0 width for combining characters. (#124175, Theppitak Karoonboonyanan) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d85c688a..c270ebe5 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Mon Jan 26 10:30:06 2004 Owen Taylor + + * pango/modules/thai/thai-shaper.c: Reapply the patch + from #124175 that somehow got reverted. + Fri Feb 13 10:54:18 2004 Owen Taylor Memory leak fixes from Masatake YAMATO, #130652 @@ -88,7 +93,7 @@ Mon Jan 26 14:20:34 2004 Owen Taylor Mon Jan 26 10:30:06 2004 Owen Taylor - * pango/modules/thai/thai-c: Fix up glyph addition + * pango/modules/thai/thai-shaper.c: Fix up glyph addition code so that it works properly with the typical TrueType fonts that have 0 width for combining characters. (#124175, Theppitak Karoonboonyanan) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d85c688a..c270ebe5 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Mon Jan 26 10:30:06 2004 Owen Taylor + + * pango/modules/thai/thai-shaper.c: Reapply the patch + from #124175 that somehow got reverted. + Fri Feb 13 10:54:18 2004 Owen Taylor Memory leak fixes from Masatake YAMATO, #130652 @@ -88,7 +93,7 @@ Mon Jan 26 14:20:34 2004 Owen Taylor Mon Jan 26 10:30:06 2004 Owen Taylor - * pango/modules/thai/thai-c: Fix up glyph addition + * pango/modules/thai/thai-shaper.c: Fix up glyph addition code so that it works properly with the typical TrueType fonts that have 0 width for combining characters. (#124175, Theppitak Karoonboonyanan) diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c index 5fcbc429..39c2c574 100644 --- a/modules/thai/thai-shaper.c +++ b/modules/thai/thai-shaper.c @@ -302,26 +302,15 @@ add_glyph (ThaiFontInfo *font_info, pango_font_get_glyph_extents (font_info->font, glyphs->glyphs[index].glyph, &ink_rect, &logical_rect); - if (combining) + if (combining || logical_rect.width > 0) { - glyphs->glyphs[index].geometry.x_offset = - glyphs->glyphs[index - 1].geometry.width; - glyphs->glyphs[index].geometry.width = - logical_rect.width + glyphs->glyphs[index - 1].geometry.width; - glyphs->glyphs[index - 1].geometry.width = 0; + glyphs->glyphs[index].geometry.x_offset = 0; + glyphs->glyphs[index].geometry.width = logical_rect.width; } else { - if (logical_rect.width > 0) - { - glyphs->glyphs[index].geometry.x_offset = 0; - glyphs->glyphs[index].geometry.width = logical_rect.width; - } - else - { - glyphs->glyphs[index].geometry.x_offset = ink_rect.width; - glyphs->glyphs[index].geometry.width = ink_rect.width; - } + glyphs->glyphs[index].geometry.x_offset = ink_rect.width; + glyphs->glyphs[index].geometry.width = ink_rect.width; } glyphs->glyphs[index].geometry.y_offset = 0; } -- cgit v1.2.1