summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2004-08-22 19:31:04 +0000
committerTor Lillqvist <tml@src.gnome.org>2004-08-22 19:31:04 +0000
commit90d65428c83fe7bff9ea2a5e32caa80a72d5a71b (patch)
tree667b1edaa500784a798adc766d34e3be33d79c63
parent6464e237d0d3628e784f73e0b3d2e755ec20f25f (diff)
downloadpango-90d65428c83fe7bff9ea2a5e32caa80a72d5a71b.tar.gz
Ignore synthetic vertical writing versions of East Asian fonts. (#145322,
2004-08-22 Tor Lillqvist <tml@iki.fi> * pango/pangowin32-fontmap.c (pango_win32_inner_enum_proc): Ignore synthetic vertical writing versions of East Asian fonts. (#145322, John Ehresman)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/pangowin32-fontmap.c6
5 files changed, 29 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9752073f..ac2822f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-22 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pangowin32-fontmap.c (pango_win32_inner_enum_proc): Ignore
+ synthetic vertical writing versions of East Asian fonts. (#145322,
+ John Ehresman)
+
Mon Aug 16 13:58:04 2004 Owen Taylor <otaylor@redhat.com>
* examples/renderdemo.[ch] examples/pangoft2topgm.c:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 9752073f..ac2822f2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+2004-08-22 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pangowin32-fontmap.c (pango_win32_inner_enum_proc): Ignore
+ synthetic vertical writing versions of East Asian fonts. (#145322,
+ John Ehresman)
+
Mon Aug 16 13:58:04 2004 Owen Taylor <otaylor@redhat.com>
* examples/renderdemo.[ch] examples/pangoft2topgm.c:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 9752073f..ac2822f2 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+2004-08-22 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pangowin32-fontmap.c (pango_win32_inner_enum_proc): Ignore
+ synthetic vertical writing versions of East Asian fonts. (#145322,
+ John Ehresman)
+
Mon Aug 16 13:58:04 2004 Owen Taylor <otaylor@redhat.com>
* examples/renderdemo.[ch] examples/pangoft2topgm.c:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 9752073f..ac2822f2 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+2004-08-22 Tor Lillqvist <tml@iki.fi>
+
+ * pango/pangowin32-fontmap.c (pango_win32_inner_enum_proc): Ignore
+ synthetic vertical writing versions of East Asian fonts. (#145322,
+ John Ehresman)
+
Mon Aug 16 13:58:04 2004 Owen Taylor <otaylor@redhat.com>
* examples/renderdemo.[ch] examples/pangoft2topgm.c:
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 09be6be0..93283cec 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -175,7 +175,11 @@ pango_win32_inner_enum_proc (LOGFONT *lfp,
DWORD fontType,
LPARAM lParam)
{
- pango_win32_insert_font (fontmap, lfp);
+ /* Windows generates synthetic vertical writing versions of East
+ * Asian fonts with @ prepended to their name, ignore them.
+ */
+ if (lfp->lfFaceName[0] != '@')
+ pango_win32_insert_font (fontmap, lfp);
return 1;
}