summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLog.pre-1-108
-rw-r--r--ChangeLog.pre-1-28
-rw-r--r--ChangeLog.pre-1-48
-rw-r--r--ChangeLog.pre-1-68
-rw-r--r--ChangeLog.pre-1-88
-rw-r--r--modules/basic/basic-fc.c13
-rw-r--r--modules/basic/basic-ft2.c3
-rw-r--r--modules/basic/basic-win32.c3
-rw-r--r--modules/basic/basic-x.c10
-rw-r--r--modules/basic/basic-xft.c13
11 files changed, 71 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index dcd1dffb..781299eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Mar 25 15:46:54 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/basic/basic-*.c: Convert U+00A0 (NON BREAK SPACE)
+ to U+0020 (SPACE)
+
+ * modules/basic/basic-xft.c (basic_engine_shape): Remove
+ some dead code.
+
Mon Mar 25 15:31:17 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangowin32.c (pango_win32_font_get_metrics): Set
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index dcd1dffb..781299eb 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+Mon Mar 25 15:46:54 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/basic/basic-*.c: Convert U+00A0 (NON BREAK SPACE)
+ to U+0020 (SPACE)
+
+ * modules/basic/basic-xft.c (basic_engine_shape): Remove
+ some dead code.
+
Mon Mar 25 15:31:17 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangowin32.c (pango_win32_font_get_metrics): Set
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index dcd1dffb..781299eb 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,11 @@
+Mon Mar 25 15:46:54 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/basic/basic-*.c: Convert U+00A0 (NON BREAK SPACE)
+ to U+0020 (SPACE)
+
+ * modules/basic/basic-xft.c (basic_engine_shape): Remove
+ some dead code.
+
Mon Mar 25 15:31:17 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangowin32.c (pango_win32_font_get_metrics): Set
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index dcd1dffb..781299eb 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+Mon Mar 25 15:46:54 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/basic/basic-*.c: Convert U+00A0 (NON BREAK SPACE)
+ to U+0020 (SPACE)
+
+ * modules/basic/basic-xft.c (basic_engine_shape): Remove
+ some dead code.
+
Mon Mar 25 15:31:17 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangowin32.c (pango_win32_font_get_metrics): Set
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index dcd1dffb..781299eb 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+Mon Mar 25 15:46:54 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/basic/basic-*.c: Convert U+00A0 (NON BREAK SPACE)
+ to U+0020 (SPACE)
+
+ * modules/basic/basic-xft.c (basic_engine_shape): Remove
+ some dead code.
+
Mon Mar 25 15:31:17 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangowin32.c (pango_win32_font_get_metrics): Set
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index dcd1dffb..781299eb 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+Mon Mar 25 15:46:54 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/basic/basic-*.c: Convert U+00A0 (NON BREAK SPACE)
+ to U+0020 (SPACE)
+
+ * modules/basic/basic-xft.c (basic_engine_shape): Remove
+ some dead code.
+
Mon Mar 25 15:31:17 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangowin32.c (pango_win32_font_get_metrics): Set
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index 0d2ea653..26d0d58c 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -146,21 +146,16 @@ basic_engine_shape (PangoFont *font,
gunichar wc;
gunichar mirrored_ch;
PangoGlyph index;
- char buf[6];
- const char *input;
wc = g_utf8_get_char (p);
- input = p;
if (analysis->level % 2)
if (pango_get_mirror_char (wc, &mirrored_ch))
- {
- wc = mirrored_ch;
-
- g_unichar_to_utf8 (wc, buf);
- input = buf;
- }
+ wc = mirrored_ch;
+ if (wc == 0xa0) /* non-break-space */
+ wc = 0x20;
+
if (ZERO_WIDTH_CHAR (wc))
{
set_glyph (font, glyphs, i, p - text, 0);
diff --git a/modules/basic/basic-ft2.c b/modules/basic/basic-ft2.c
index ffff113f..77fdd084 100644
--- a/modules/basic/basic-ft2.c
+++ b/modules/basic/basic-ft2.c
@@ -231,6 +231,9 @@ basic_engine_shape (PangoFont *font,
if (pango_get_mirror_char (wc, &mirrored_ch))
wc = mirrored_ch;
+ if (wc == 0xa0) /* non-break-space */
+ wc = 0x20;
+
if (ZERO_WIDTH_CHAR (wc))
{
set_glyph (font, glyphs, i, p - text, 0);
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index e5f1fdf5..f5e75be5 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -140,6 +140,9 @@ basic_engine_shape (PangoFont *font,
if (pango_get_mirror_char (wc, &mirrored_ch))
wc = mirrored_ch;
+ if (wc == 0xa0) /* non-break-space */
+ wc = 0x20;
+
if (wc == 0x200B || wc == 0x200E || wc == 0x200F) /* Zero-width characters */
{
set_glyph (font, glyphs, i, p - text, 0);
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index 6e92531b..ced21fd8 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -533,7 +533,7 @@ basic_engine_shape (PangoFont *font,
const char *input;
wc = g_utf8_get_char (p);
-
+
input = p;
if (analysis->level % 2)
if (pango_get_mirror_char (wc, &mirrored_ch))
@@ -544,6 +544,14 @@ basic_engine_shape (PangoFont *font,
input = buf;
}
+ if (wc == 0xa0) /* non-break-space */
+ {
+ wc = 0x20;
+
+ g_unichar_to_utf8 (wc, buf);
+ input = buf;
+ }
+
if (ZERO_WIDTH_CHAR (wc))
{
set_glyph (font, glyphs, i, p - text, 0);
diff --git a/modules/basic/basic-xft.c b/modules/basic/basic-xft.c
index 0d2ea653..26d0d58c 100644
--- a/modules/basic/basic-xft.c
+++ b/modules/basic/basic-xft.c
@@ -146,21 +146,16 @@ basic_engine_shape (PangoFont *font,
gunichar wc;
gunichar mirrored_ch;
PangoGlyph index;
- char buf[6];
- const char *input;
wc = g_utf8_get_char (p);
- input = p;
if (analysis->level % 2)
if (pango_get_mirror_char (wc, &mirrored_ch))
- {
- wc = mirrored_ch;
-
- g_unichar_to_utf8 (wc, buf);
- input = buf;
- }
+ wc = mirrored_ch;
+ if (wc == 0xa0) /* non-break-space */
+ wc = 0x20;
+
if (ZERO_WIDTH_CHAR (wc))
{
set_glyph (font, glyphs, i, p - text, 0);
View Lorry Controller Status