summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-1-1010
-rw-r--r--ChangeLog.pre-1-210
-rw-r--r--ChangeLog.pre-1-410
-rw-r--r--ChangeLog.pre-1-610
-rw-r--r--ChangeLog.pre-1-810
-rw-r--r--modules/thai/thai-fc.c15
-rw-r--r--modules/thai/thai-shaper.h4
-rw-r--r--modules/thai/thai-x.c4
-rw-r--r--modules/thai/thai-xft.c15
10 files changed, 84 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index aa0a08c4..a5e4a0d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jul 31 15:43:39 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/thai/{thai-shaper.h,thai-x.c,thai-xft.c}:
+ Argument to make_glyph() shouldn't have been
+ unsigned char, since we pass unicode through it.
+
+ * modules/thai/thai-xft.c (make_glyph): Handle
+ THAI_FONT_ISO10646 correctly. If a character isn't
+ found, return the correct unknown glyph.
+
Sat Jul 27 18:18:20 2002 Owen Taylor <otaylor@redhat.com>
Patch from Changwoo Ryu <cwryu@debian.org> (#86591)
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index aa0a08c4..a5e4a0d0 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Wed Jul 31 15:43:39 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/thai/{thai-shaper.h,thai-x.c,thai-xft.c}:
+ Argument to make_glyph() shouldn't have been
+ unsigned char, since we pass unicode through it.
+
+ * modules/thai/thai-xft.c (make_glyph): Handle
+ THAI_FONT_ISO10646 correctly. If a character isn't
+ found, return the correct unknown glyph.
+
Sat Jul 27 18:18:20 2002 Owen Taylor <otaylor@redhat.com>
Patch from Changwoo Ryu <cwryu@debian.org> (#86591)
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index aa0a08c4..a5e4a0d0 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,13 @@
+Wed Jul 31 15:43:39 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/thai/{thai-shaper.h,thai-x.c,thai-xft.c}:
+ Argument to make_glyph() shouldn't have been
+ unsigned char, since we pass unicode through it.
+
+ * modules/thai/thai-xft.c (make_glyph): Handle
+ THAI_FONT_ISO10646 correctly. If a character isn't
+ found, return the correct unknown glyph.
+
Sat Jul 27 18:18:20 2002 Owen Taylor <otaylor@redhat.com>
Patch from Changwoo Ryu <cwryu@debian.org> (#86591)
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index aa0a08c4..a5e4a0d0 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Wed Jul 31 15:43:39 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/thai/{thai-shaper.h,thai-x.c,thai-xft.c}:
+ Argument to make_glyph() shouldn't have been
+ unsigned char, since we pass unicode through it.
+
+ * modules/thai/thai-xft.c (make_glyph): Handle
+ THAI_FONT_ISO10646 correctly. If a character isn't
+ found, return the correct unknown glyph.
+
Sat Jul 27 18:18:20 2002 Owen Taylor <otaylor@redhat.com>
Patch from Changwoo Ryu <cwryu@debian.org> (#86591)
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index aa0a08c4..a5e4a0d0 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Wed Jul 31 15:43:39 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/thai/{thai-shaper.h,thai-x.c,thai-xft.c}:
+ Argument to make_glyph() shouldn't have been
+ unsigned char, since we pass unicode through it.
+
+ * modules/thai/thai-xft.c (make_glyph): Handle
+ THAI_FONT_ISO10646 correctly. If a character isn't
+ found, return the correct unknown glyph.
+
Sat Jul 27 18:18:20 2002 Owen Taylor <otaylor@redhat.com>
Patch from Changwoo Ryu <cwryu@debian.org> (#86591)
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index aa0a08c4..a5e4a0d0 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Wed Jul 31 15:43:39 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/thai/{thai-shaper.h,thai-x.c,thai-xft.c}:
+ Argument to make_glyph() shouldn't have been
+ unsigned char, since we pass unicode through it.
+
+ * modules/thai/thai-xft.c (make_glyph): Handle
+ THAI_FONT_ISO10646 correctly. If a character isn't
+ found, return the correct unknown glyph.
+
Sat Jul 27 18:18:20 2002 Owen Taylor <otaylor@redhat.com>
Patch from Changwoo Ryu <cwryu@debian.org> (#86591)
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c
index 169aa66d..3a20a536 100644
--- a/modules/thai/thai-fc.c
+++ b/modules/thai/thai-fc.c
@@ -162,23 +162,28 @@ get_font_info (PangoFont *font)
}
PangoGlyph
-make_glyph (ThaiFontInfo *font_info, unsigned char c)
+make_glyph (ThaiFontInfo *font_info, unsigned int c)
{
int index;
+ PangoGlyph result;
switch (font_info->font_set) {
- case THAI_FONT_ISO10646:
+ case THAI_FONT_ISO10646:index = c; break;
case THAI_FONT_TIS: index = (c & 0x80) ? tis620_0[c & 0x7f] : c; break;
case THAI_FONT_TIS_MAC: index = (c & 0x80) ? tis620_1[c & 0x7f] : c; break;
case THAI_FONT_TIS_WIN: index = (c & 0x80) ? tis620_2[c & 0x7f] : c; break;
default: index = 0; break;
}
-
- return pango_xft_font_get_glyph (font_info->font, index);
+
+ result = pango_xft_font_get_glyph (font_info->font, index);
+ if (result)
+ return result;
+ else
+ return pango_xft_font_get_unknown_glyph (font_info->font, c);
}
PangoGlyph
-make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c)
+make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c)
{
return pango_xft_font_get_unknown_glyph (font_info->font, c);
}
diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h
index 57f4f929..fa2f879e 100644
--- a/modules/thai/thai-shaper.h
+++ b/modules/thai/thai-shaper.h
@@ -38,10 +38,10 @@ ThaiFontInfo *
get_font_info (PangoFont *font);
PangoGlyph
-make_glyph (ThaiFontInfo *font_info, unsigned char c);
+make_glyph (ThaiFontInfo *font_info, unsigned int c);
PangoGlyph
-make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c);
+make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c);
/*
* Public functions
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index 9890e64f..dbd15b64 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -126,13 +126,13 @@ get_font_info (PangoFont *font)
}
PangoGlyph
-make_glyph (ThaiFontInfo *font_info, unsigned char c)
+make_glyph (ThaiFontInfo *font_info, unsigned int c)
{
return PANGO_X_MAKE_GLYPH (font_info->subfont, c);
}
PangoGlyph
-make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c)
+make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c)
{
return pango_x_get_unknown_glyph (font_info->font);
}
diff --git a/modules/thai/thai-xft.c b/modules/thai/thai-xft.c
index 169aa66d..3a20a536 100644
--- a/modules/thai/thai-xft.c
+++ b/modules/thai/thai-xft.c
@@ -162,23 +162,28 @@ get_font_info (PangoFont *font)
}
PangoGlyph
-make_glyph (ThaiFontInfo *font_info, unsigned char c)
+make_glyph (ThaiFontInfo *font_info, unsigned int c)
{
int index;
+ PangoGlyph result;
switch (font_info->font_set) {
- case THAI_FONT_ISO10646:
+ case THAI_FONT_ISO10646:index = c; break;
case THAI_FONT_TIS: index = (c & 0x80) ? tis620_0[c & 0x7f] : c; break;
case THAI_FONT_TIS_MAC: index = (c & 0x80) ? tis620_1[c & 0x7f] : c; break;
case THAI_FONT_TIS_WIN: index = (c & 0x80) ? tis620_2[c & 0x7f] : c; break;
default: index = 0; break;
}
-
- return pango_xft_font_get_glyph (font_info->font, index);
+
+ result = pango_xft_font_get_glyph (font_info->font, index);
+ if (result)
+ return result;
+ else
+ return pango_xft_font_get_unknown_glyph (font_info->font, c);
}
PangoGlyph
-make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c)
+make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c)
{
return pango_xft_font_get_unknown_glyph (font_info->font, c);
}