improved some X11 fotn registry aliases

12 files changed, 69 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 46e09fff..ab4c2b03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-01
+
+	* modules/thai/thai.c: added aliases for X11 font names used on
+	Solaris
+	* modules/arabic/{arabic,naqshfont}.c: changed X11 font registry from
+	"symbol-0" to "urdunaqsh-0"; using "symbol-0" isn't really usable;
+	you get almost always the bad font...
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-attributes.c (pango_attr_scale_new): Add a new
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 46e09fff..ab4c2b03 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,11 @@
+2000-11-01
+
+	* modules/thai/thai.c: added aliases for X11 font names used on
+	Solaris
+	* modules/arabic/{arabic,naqshfont}.c: changed X11 font registry from
+	"symbol-0" to "urdunaqsh-0"; using "symbol-0" isn't really usable;
+	you get almost always the bad font...
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-attributes.c (pango_attr_scale_new): Add a new
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 46e09fff..ab4c2b03 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+2000-11-01
+
+	* modules/thai/thai.c: added aliases for X11 font names used on
+	Solaris
+	* modules/arabic/{arabic,naqshfont}.c: changed X11 font registry from
+	"symbol-0" to "urdunaqsh-0"; using "symbol-0" isn't really usable;
+	you get almost always the bad font...
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-attributes.c (pango_attr_scale_new): Add a new
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 46e09fff..ab4c2b03 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,11 @@
+2000-11-01
+
+	* modules/thai/thai.c: added aliases for X11 font names used on
+	Solaris
+	* modules/arabic/{arabic,naqshfont}.c: changed X11 font registry from
+	"symbol-0" to "urdunaqsh-0"; using "symbol-0" isn't really usable;
+	you get almost always the bad font...
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-attributes.c (pango_attr_scale_new): Add a new
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 46e09fff..ab4c2b03 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+2000-11-01
+
+	* modules/thai/thai.c: added aliases for X11 font names used on
+	Solaris
+	* modules/arabic/{arabic,naqshfont}.c: changed X11 font registry from
+	"symbol-0" to "urdunaqsh-0"; using "symbol-0" isn't really usable;
+	you get almost always the bad font...
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-attributes.c (pango_attr_scale_new): Add a new
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 46e09fff..ab4c2b03 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+2000-11-01
+
+	* modules/thai/thai.c: added aliases for X11 font names used on
+	Solaris
+	* modules/arabic/{arabic,naqshfont}.c: changed X11 font registry from
+	"symbol-0" to "urdunaqsh-0"; using "symbol-0" isn't really usable;
+	you get almost always the bad font...
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-attributes.c (pango_attr_scale_new): Add a new
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 46e09fff..ab4c2b03 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+2000-11-01
+
+	* modules/thai/thai.c: added aliases for X11 font names used on
+	Solaris
+	* modules/arabic/{arabic,naqshfont}.c: changed X11 font registry from
+	"symbol-0" to "urdunaqsh-0"; using "symbol-0" isn't really usable;
+	you get almost always the bad font...
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pango-attributes.c (pango_attr_scale_new): Add a new
diff --git a/modules/arabic/arabic-x.c b/modules/arabic/arabic-x.c
index 64761783..6b10fc19 100644
--- a/modules/arabic/arabic-x.c
+++ b/modules/arabic/arabic-x.c
@@ -134,7 +134,7 @@ find_unic_font (PangoFont *font,char* charsets[],PangoXSubfont* rfonts)
 #endif
                     break;
                 } 
-            else if ( (strcmp (charsets[subfont_charsets[i]], "symbol-0") == 0)
+            else if ( (strcmp (charsets[subfont_charsets[i]], "urdunaqsh-0") == 0)
                       && urdu_naqshinit(font,rfonts) )
                 {
                     result = ar_standard | ar_naqshfont;
@@ -180,7 +180,7 @@ static char *default_charset[] = {
     "iso10646-1",  
     "iso8859-6.8x",
     "mulearabic-2",
-    "symbol-0"
+    "urdunaqsh-0",
 };
   
 
diff --git a/modules/arabic/arabic.c b/modules/arabic/arabic.c
index 64761783..6b10fc19 100644
--- a/modules/arabic/arabic.c
+++ b/modules/arabic/arabic.c
@@ -134,7 +134,7 @@ find_unic_font (PangoFont *font,char* charsets[],PangoXSubfont* rfonts)
 #endif
                     break;
                 } 
-            else if ( (strcmp (charsets[subfont_charsets[i]], "symbol-0") == 0)
+            else if ( (strcmp (charsets[subfont_charsets[i]], "urdunaqsh-0") == 0)
                       && urdu_naqshinit(font,rfonts) )
                 {
                     result = ar_standard | ar_naqshfont;
@@ -180,7 +180,7 @@ static char *default_charset[] = {
     "iso10646-1",  
     "iso8859-6.8x",
     "mulearabic-2",
-    "symbol-0"
+    "urdunaqsh-0",
 };
   
 
diff --git a/modules/arabic/naqshfont.c b/modules/arabic/naqshfont.c
index 153df867..c390ce4d 100644
--- a/modules/arabic/naqshfont.c
+++ b/modules/arabic/naqshfont.c
@@ -21,7 +21,7 @@ int
 urdu_naqshinit(PangoFont  *font,PangoXSubfont* nqfont)
 { 
     static char *nq_charsets0[] = {
-        "symbol-0",
+        "urdunaqsh-0",
     };
 
     PangoXSubfont *subfonts;
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index aaa52140..0b237d46 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -140,7 +140,9 @@ get_font_info (PangoFont *font)
   static const char *charsets[] = {
     "xtis620.2529-1",
     "xtis-0",
+    "tis620.2533-0",
     "tis620.2533-1",
+    "tis620.2529-0",
     "tis620.2529-1",
     "iso8859-11",
     "iso10646-1",
@@ -152,6 +154,8 @@ get_font_info (PangoFont *font)
     THAI_FONT_TIS,
     THAI_FONT_TIS,
     THAI_FONT_TIS,
+    THAI_FONT_TIS,
+    THAI_FONT_TIS,
     THAI_FONT_ISO10646
   };
   
diff --git a/modules/thai/thai.c b/modules/thai/thai.c
index aaa52140..0b237d46 100644
--- a/modules/thai/thai.c
+++ b/modules/thai/thai.c
@@ -140,7 +140,9 @@ get_font_info (PangoFont *font)
   static const char *charsets[] = {
     "xtis620.2529-1",
     "xtis-0",
+    "tis620.2533-0",
     "tis620.2533-1",
+    "tis620.2529-0",
     "tis620.2529-1",
     "iso8859-11",
     "iso10646-1",
@@ -152,6 +154,8 @@ get_font_info (PangoFont *font)
     THAI_FONT_TIS,
     THAI_FONT_TIS,
     THAI_FONT_TIS,
+    THAI_FONT_TIS,
+    THAI_FONT_TIS,
     THAI_FONT_ISO10646
   };