summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2008-05-20 18:35:46 +0000
committerTor Lillqvist <tml@src.gnome.org>2008-05-20 18:35:46 +0000
commit7d2d0dfbc355f334c6b0183e6354f5b22732831a (patch)
treef6fb26b472bc81f78e5ab820367c1a5475984988
parentc75a2817f82b931864d8966e4ce158d5f8183b07 (diff)
downloadpango-7d2d0dfbc355f334c6b0183e6354f5b22732831a.tar.gz
Bug 523193 - Vista Hebrew, CJK fonts to builtin win32 pango aliases
2008-05-20 Tor Lillqvist <tml@novell.com> Bug 523193 - Vista Hebrew, CJK fonts to builtin win32 pango aliases Patch by Daniel Atallah. * pango/pango-utils.c: Add fonts from Vista to the builtin aliases. Also add Lucida Sans Unicode and Lucida Console. svn path=/branches/pango-1-20/; revision=2631
-rw-r--r--ChangeLog9
-rw-r--r--pango/pango-utils.c12
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4338dd16..d69203cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-20 Tor Lillqvist <tml@novell.com>
+
+ Bug 523193 – Vista Hebrew, CJK fonts to builtin win32 pango aliases
+
+ Patch by Daniel Atallah.
+
+ * pango/pango-utils.c: Add fonts from Vista to the builtin
+ aliases. Also add Lucida Sans Unicode and Lucida Console.
+
2008-05-03 Behdad Esfahbod <behdad@gnome.org>
Bug 531242 – Leak when calculating win32 font coverage
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index d2e49924..3833950d 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -1340,8 +1340,8 @@ handle_alias_line (GString *line_buffer,
static const char *builtin_aliases[] = {
"courier = \"courier new\"",
- "\"segoe ui\" = \"segoe ui,arial unicode ms,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
- "tahoma = \"tahoma,arial unicode ms,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
+ "\"segoe ui\" = \"segoe ui,meiryo,malgun gothic,microsoft jhenghei,microsoft yahei,gisha,leelawadee,arial unicode ms,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
+ "tahoma = \"tahoma,arial unicode ms,lucida sans unicode,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
/* It sucks to use the same GulimChe, MS Gothic, Sylfaen, Kartika,
* Latha, Mangal and Raavi fonts for all three of sans, serif and
* mono, but it isn't like there would be much choice. For most
@@ -1349,11 +1349,11 @@ static const char *builtin_aliases[] = {
* has ony one. One solution is to install the free DejaVu fonts
* that are popular on Linux. They are listed here first.
*/
- "sans = \"dejavu sans,tahoma,arial unicode ms,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
- "sans-serif = \"dejavu sans,tahoma,arial unicode ms,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
+ "sans = \"dejavu sans,tahoma,arial unicode ms,lucida sans unicode,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
+ "sans-serif = \"dejavu sans,tahoma,arial unicode ms,lucida sans unicode,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
"serif = \"dejavu serif,georgia,angsana new,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
- "mono = \"dejavu sans mono,courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
- "monospace = \"dejavu sans mono,courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\""
+ "mono = \"dejavu sans mono,courier new,lucida console,courier monothai,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
+ "monospace = \"dejavu sans mono,courier new,lucida console,courier monothai,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\""
};
static void