diff options
| author | Tor Lillqvist <tml@iki.fi> | 2004-09-15 21:49:06 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2004-09-15 21:49:06 +0000 |
| commit | c61784038f5de8c33fc897530327e030f5e539e1 (patch) | |
| tree | 24ac4e014f0588e8f3fc4f7736ffd614e57157d6 | |
| parent | 401b96c0df68cd854ee883951bda2f8cb1969760 (diff) | |
| download | pango-c61784038f5de8c33fc897530327e030f5e539e1.tar.gz | |
Ignore fonts in SYMBOL_CHARSET. They don't have any Unicode mapping table.
2004-09-15 Tor Lillqvist <tml@iki.fi>
* pango/pangowin32-fontmap.c (pango_win32_insert_font): Ignore
fonts in SYMBOL_CHARSET. They don't have any Unicode mapping
table. (#152473)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 4 | ||||
| -rw-r--r-- | pango/pangowin32-fontmap.c | 8 |
5 files changed, 24 insertions, 0 deletions
@@ -1,5 +1,9 @@ 2004-09-15 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32-fontmap.c (pango_win32_insert_font): Ignore + fonts in SYMBOL_CHARSET. They don't have any Unicode mapping + table. (#152473) + * pango/querymodules.c (string_needs_escape, escape_string): Escape also backslashes. (#152607, Kazuki Iwamoto) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 7f1f41cb..4aba9bff 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,9 @@ 2004-09-15 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32-fontmap.c (pango_win32_insert_font): Ignore + fonts in SYMBOL_CHARSET. They don't have any Unicode mapping + table. (#152473) + * pango/querymodules.c (string_needs_escape, escape_string): Escape also backslashes. (#152607, Kazuki Iwamoto) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 7f1f41cb..4aba9bff 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,5 +1,9 @@ 2004-09-15 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32-fontmap.c (pango_win32_insert_font): Ignore + fonts in SYMBOL_CHARSET. They don't have any Unicode mapping + table. (#152473) + * pango/querymodules.c (string_needs_escape, escape_string): Escape also backslashes. (#152607, Kazuki Iwamoto) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 7f1f41cb..4aba9bff 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,5 +1,9 @@ 2004-09-15 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32-fontmap.c (pango_win32_insert_font): Ignore + fonts in SYMBOL_CHARSET. They don't have any Unicode mapping + table. (#152473) + * pango/querymodules.c (string_needs_escape, escape_string): Escape also backslashes. (#152607, Kazuki Iwamoto) diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 4102c7dc..3345d4fe 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -676,6 +676,14 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap, PING(("face=%s,charset=%d,it=%d,wt=%ld,ht=%ld",lfp->lfFaceName,lfp->lfCharSet,lfp->lfItalic,lfp->lfWeight,lfp->lfHeight)); + /* Ignore Symbol fonts (which don't have any Unicode mapping + * table). We could also be fancy and use the PostScript glyph name + * table for such if present, and build a Unicode map by mapping + * each PostScript glyph name to Unicode character. Oh well. + */ + if (lfp->lfCharSet == SYMBOL_CHARSET) + return; + /* First insert the LOGFONT into the list of LOGFONTs for the typeface name */ size_info = g_hash_table_lookup (win32fontmap->size_infos, lfp); |