summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2008-05-20 18:31:28 +0000
committerTor Lillqvist <tml@src.gnome.org>2008-05-20 18:31:28 +0000
commit077e95bb3773d38568958d2542f1d2b25cdfd121 (patch)
tree55199f11dcd129efbc3028a36f3ed7b62f660a64
parentf7040055126d2661e4bc71309b6ba7a003679e81 (diff)
downloadpango-077e95bb3773d38568958d2542f1d2b25cdfd121.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=/trunk/; revision=2629
-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 b5abeda8..82b9c40e 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-13 Behdad Esfahbod <behdad@gnome.org>
* === Released 1.21.1 ===
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 9df61673..ca7549d2 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -1218,8 +1218,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
@@ -1227,11 +1227,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