diff options
| author | Tor Lillqvist <tml@iki.fi> | 2004-09-15 21:51:36 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2004-09-15 21:51:36 +0000 |
| commit | 80aa451c150d17616fe15fc3763095ce3d72466d (patch) | |
| tree | ba63b855970663fed874743598c72d7a495bd231 | |
| parent | 395402a366778cff95d51809859751f8a995ebff (diff) | |
| download | pango-80aa451c150d17616fe15fc3763095ce3d72466d.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. (#149643)
| -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. (#149643) + * 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 6eff0f05..2077bea4 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. (#149643) + * 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 6eff0f05..2077bea4 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. (#149643) + * 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 6eff0f05..2077bea4 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. (#149643) + * 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 93283cec..66053356 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -645,6 +645,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); |