summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--pango/pango-utils.c1
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ae769c30..fb174c20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-23 Tor Lillqvist <tml@novell.com>
+
+ * pango/pango-utils.c: Revert the addition of the alias
+ "sansserif". The correct name is "sans-serif", and "sans" should
+ also be accepted. If something uses "sansserif" it is wrong. (I
+ saw it in some sample svg files in librsvg.)
+
2008-05-20 Tor Lillqvist <tml@novell.com>
* pango/pango-utils.c: Add alias "sansserif" to the builtin
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 9814cfa3..ca7549d2 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -1228,7 +1228,6 @@ static const char *builtin_aliases[] = {
* that are popular on Linux. They are listed here first.
*/
"sans = \"dejavu sans,tahoma,arial unicode ms,lucida sans unicode,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",
- "sansserif = \"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,lucida console,courier monothai,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"",