fixed big5 handling bug

11 files changed, 73 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index aa193e9b6c..ba7bdd37c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-03  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* gtk/gtkrc.zh_TW.*: moved gtkrc.zh_TW.Big5 to gtkrc.zh_TW.big5;
+	the charset encodign portion MUST be in lowercase.
+	* gtk/gtkrc.az: added file for Azeri language
+
 2000-11-03  Havoc Pennington  <hp@redhat.com>
 
         Get widgets working on the btree/buffer side. Display of them 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index aa193e9b6c..ba7bdd37c6 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2000-11-03  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* gtk/gtkrc.zh_TW.*: moved gtkrc.zh_TW.Big5 to gtkrc.zh_TW.big5;
+	the charset encodign portion MUST be in lowercase.
+	* gtk/gtkrc.az: added file for Azeri language
+
 2000-11-03  Havoc Pennington  <hp@redhat.com>
 
         Get widgets working on the btree/buffer side. Display of them 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index aa193e9b6c..ba7bdd37c6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2000-11-03  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* gtk/gtkrc.zh_TW.*: moved gtkrc.zh_TW.Big5 to gtkrc.zh_TW.big5;
+	the charset encodign portion MUST be in lowercase.
+	* gtk/gtkrc.az: added file for Azeri language
+
 2000-11-03  Havoc Pennington  <hp@redhat.com>
 
         Get widgets working on the btree/buffer side. Display of them 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index aa193e9b6c..ba7bdd37c6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2000-11-03  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* gtk/gtkrc.zh_TW.*: moved gtkrc.zh_TW.Big5 to gtkrc.zh_TW.big5;
+	the charset encodign portion MUST be in lowercase.
+	* gtk/gtkrc.az: added file for Azeri language
+
 2000-11-03  Havoc Pennington  <hp@redhat.com>
 
         Get widgets working on the btree/buffer side. Display of them 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index aa193e9b6c..ba7bdd37c6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2000-11-03  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* gtk/gtkrc.zh_TW.*: moved gtkrc.zh_TW.Big5 to gtkrc.zh_TW.big5;
+	the charset encodign portion MUST be in lowercase.
+	* gtk/gtkrc.az: added file for Azeri language
+
 2000-11-03  Havoc Pennington  <hp@redhat.com>
 
         Get widgets working on the btree/buffer side. Display of them 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index aa193e9b6c..ba7bdd37c6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2000-11-03  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* gtk/gtkrc.zh_TW.*: moved gtkrc.zh_TW.Big5 to gtkrc.zh_TW.big5;
+	the charset encodign portion MUST be in lowercase.
+	* gtk/gtkrc.az: added file for Azeri language
+
 2000-11-03  Havoc Pennington  <hp@redhat.com>
 
         Get widgets working on the btree/buffer side. Display of them 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index aa193e9b6c..ba7bdd37c6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2000-11-03  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* gtk/gtkrc.zh_TW.*: moved gtkrc.zh_TW.Big5 to gtkrc.zh_TW.big5;
+	the charset encodign portion MUST be in lowercase.
+	* gtk/gtkrc.az: added file for Azeri language
+
 2000-11-03  Havoc Pennington  <hp@redhat.com>
 
         Get widgets working on the btree/buffer side. Display of them 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 23cea4d199..f4eaa8925b 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -501,10 +501,10 @@ EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la
 
 
 gtkconfdir = $(sysconfdir)/gtk-2.0
-gtkconf_DATA = gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
+gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
 	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \
 	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
-	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 \
+	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \
 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii \
 	gtkrc.cp1251
@@ -525,13 +525,14 @@ install-data-local:
 	   done \
 	&& rm -f gtkrc.lt gtkrc.lv gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
 	         gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi \
-	         gtkrc.be gtkrc.bg \
+	         gtkrc.be gtkrc.bg gtkrc.mi \
+	&& ln -s gtkrc.iso-8859-13 gtkrc.mi \
 	&& ln -s gtkrc.iso-8859-13 gtkrc.lt \
 	&& ln -s gtkrc.iso-8859-13 gtkrc.lv \
 	&& ln -s gtkrc.iso-8859-14 gtkrc.cy \
 	&& ln -s gtkrc.iso-8859-14 gtkrc.ga \
 	&& ln -s gtkrc.iso-8859-15 gtkrc.et \
-	&& ln -s gtkrc.ka_GE.georgianacademy gtkrc.ka \
+	&& ln -s gtkrc.ka_GE.georgianps gtkrc.ka \
 	&& ln -s gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 \
 	&& ln -s gtkrc.vi_VN.tcvn gtkrc.vi_VN.tcvn5712 \
 	&& ln -s gtkrc.vi_VN.tcvn5712 gtkrc.vi \
diff --git a/gtk/gtkrc.az b/gtk/gtkrc.az
new file mode 100644
index 0000000000..ba0452de92
--- /dev/null
+++ b/gtk/gtkrc.az
@@ -0,0 +1,8 @@
+style "gtk-default-az" {
+       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
+                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
+		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-9e,\
+		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-9e,*-r-*"
+}
+class "GtkWidget" style "gtk-default-az"
+
diff --git a/gtk/gtkrc.zh_TW.Big5 b/gtk/gtkrc.zh_TW.Big5
deleted file mode 100644
index 5c836b4695..0000000000
--- a/gtk/gtkrc.zh_TW.Big5
+++ /dev/null
@@ -1,14 +0,0 @@
-# $(gtkconfigdir)/gtkrc.zh_TW
-#
-# This file defines the fontsets for Chinese language (ch) using
-# the traditional chinese Big5 encoding as used in Taiwan (TW)
-#
-# 1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch>
-#
-
-style "gtk-default-zh-tw" {
-       fontset = "-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-*,\
-		  -*-*-medium-r-normal--14-*-*-*-*-*-big5-0"
-}
-class "GtkWidget" style "gtk-default-zh-tw"
-
diff --git a/gtk/gtkrc.zh_TW.big5 b/gtk/gtkrc.zh_TW.big5
new file mode 100644
index 0000000000..5d012d9d4b
--- /dev/null
+++ b/gtk/gtkrc.zh_TW.big5
@@ -0,0 +1,18 @@
+# $(gtkconfigdir)/gtkrc.zh_TW
+#
+# This file defines the fontsets for Chinese language (ch) using
+# the traditional chinese Big5 encoding as used in Taiwan (TW)
+#
+# 1999, Pablo Saratxaga <pablo@mandrakesoft.com>
+#
+
+# IMPORTANT NOTE: The name of this file *MUST* be "gtkrc.zh_TW.big5"
+# the lowercasing of "big5" is done on purpose, if you change it it won't work
+
+style "gtk-default-zh-tw" {
+	fontset = "-adobe-helvetica-medium-r-normal--16-*-*-*-*-*-iso8859-1,\
+		  -taipei-*-medium-r-normal--*-*-*-*-*-*-big5-0,\
+		  -*-*-medium-r-normal--16-*-*-*-*-*-big5-0,*-r-*"
+}
+class "GtkWidget" style "gtk-default-zh-tw"
+