[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 06:35:10 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 2ed70aa6896757c417f5d5f98206c6321469efb8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 28 07:30:22 2002 +0000

            * kwq/mac-encodings.txt: Sort all the character set names alphabetically, and use all lower case.
            * kwq/make-charset-table.pl: Require lower-case sorted lists of character set names.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1927 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 95d9404..73ab51e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-08-28  Darin Adler  <darin at apple.com>
 
+        * kwq/mac-encodings.txt: Sort all the character set names alphabetically, and use all lower case.
+        * kwq/make-charset-table.pl: Require lower-case sorted lists of character set names.
+
+2002-08-28  Darin Adler  <darin at apple.com>
+
 	- fixed 3032148 -- Button not disabled in page
 
         * kwq/KWQWidget.mm: (QWidget::setEnabled): Call setEnabled:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 95d9404..73ab51e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-08-28  Darin Adler  <darin at apple.com>
 
+        * kwq/mac-encodings.txt: Sort all the character set names alphabetically, and use all lower case.
+        * kwq/make-charset-table.pl: Require lower-case sorted lists of character set names.
+
+2002-08-28  Darin Adler  <darin at apple.com>
+
 	- fixed 3032148 -- Button not disabled in page
 
         * kwq/KWQWidget.mm: (QWidget::setEnabled): Call setEnabled:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 95d9404..73ab51e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-08-28  Darin Adler  <darin at apple.com>
 
+        * kwq/mac-encodings.txt: Sort all the character set names alphabetically, and use all lower case.
+        * kwq/make-charset-table.pl: Require lower-case sorted lists of character set names.
+
+2002-08-28  Darin Adler  <darin at apple.com>
+
 	- fixed 3032148 -- Button not disabled in page
 
         * kwq/KWQWidget.mm: (QWidget::setEnabled): Call setEnabled:
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index 58b567f..332bd72 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -7,17 +7,17 @@ MacRoman: macintosh, x-mac-roman
 WindowsLatin1: windows-1252, x-ansi
 ISOLatin1: iso-8859-1, iso8859-1
 NextStepLatin: x-nextstep
-ASCII: us-ascii, iso-ir-6us
+ASCII: iso-ir-6us, us-ascii
 Unicode # utf-16be, unicodeFFFE, unicode? (would this help us?)
   # Note the bogus entry to make UTF-16 mean UTF-8.
   # We do this because Internet Explorer does, and because web pages say UTF-16 and mean UTF-8.
   # See bug 2969378 and http://zingermans.com/ for a concrete example.
   # It's not clear what to do about 16-bit encodings in general.
-UTF8: utf-8, unicode-1-1-utf-8, unicode-2-0-utf-8, x-unicode-2-0-utf-8, utf-16
+UTF8: unicode-1-1-utf-8, unicode-2-0-utf-8, utf-16, utf-8, x-unicode-2-0-utf-8
 NonLossyASCII
 
 MacJapanese: x-mac-japanese
-MacChineseTrad: x-mac-trad-chinese, x-mac-chinesetrad
+MacChineseTrad: x-mac-chinesetrad, x-mac-trad-chinese
 MacKorean: x-mac-korean
 MacArabic: x-mac-arabic
 MacHebrew: x-mac-hebrew
@@ -39,11 +39,11 @@ MacThai: x-mac-thai
 MacLaotian
 MacGeorgian
 MacArmenian
-MacChineseSimp: x-mac-simp-chinese, x-mac-chinesesimp
+MacChineseSimp: x-mac-chinesesimp, x-mac-simp-chinese
 MacTibetan: x-mac-tibetan
 MacMongolian
 MacEthiopic
-MacCentralEurRoman: x-mac-centraleurroman, x-mac-ce
+MacCentralEurRoman: x-mac-ce, x-mac-centraleurroman
 MacVietnamese
 MacExtArabic
 
@@ -71,17 +71,17 @@ ISOLatinArabic: iso-8859-6
 ISOLatinGreek: iso-8859-7
   # This includes both logical and visual variants of Hebrew.
   # That's probably not going to work in the real thing.
-ISOLatinHebrew: iso-8859-8, iso-8859-8-i, iso-8859-8-e, DOS-862, logical, visual
+ISOLatinHebrew: dos-862, iso-8859-8, iso-8859-8-e, iso-8859-8-i, logical, visual
 ISOLatin5: iso-8859-9
 ISOLatin6: iso-8859-10
 ISOLatinThai: iso-8859-11
 ISOLatin7: iso-8859-13
 ISOLatin8: iso-8859-14
-ISOLatin9: iso-8859-15, l9, latin9, csISOLatin9
+ISOLatin9: csisolatin9, iso-8859-15, l9, latin9
 
 DOSLatinUS: cp437
 DOSGreek: cp737, ibm737
-DOSBalticRim: cp775, cp500
+DOSBalticRim: cp500, cp775
 DOSLatin1: cp850
 DOSGreek1
 DOSLatin2: cp852
@@ -95,7 +95,7 @@ DOSArabic: cp864, dos-720
 DOSNordic
 DOSRussian: cp866
 DOSGreek2: ibm869
-DOSThai: tis-620, cp874, windows-874, dos-874
+DOSThai: cp874, dos-874, tis-620, windows-874
 DOSJapanese: cp932
 DOSChineseSimplif: cp936
 DOSKorean: cp949
@@ -105,21 +105,21 @@ WindowsCyrillic: windows-1251, x-cp1251
 WindowsGreek: windows-1253
 WindowsLatin5: windows-1254
 WindowsHebrew: windows-1255
-WindowsArabic: windows-1256, cp1256
+WindowsArabic: cp1256, windows-1256
 WindowsBalticRim: windows-1257
 WindowsKoreanJohab: johab
 WindowsVietnamese: windows-1258
 
-JIS_X0201_76: JIS_X0201
-JIS_X0208_83: JIS_X0208-1983
-JIS_X0208_90: JIS_X0208-1990
-JIS_X0212_90: JIS_X0212-1990
-JIS_C6226_78: JIS_C6226-1978
+JIS_X0201_76: jis_x0201
+JIS_X0208_83: jis_x0208-1983
+JIS_X0208_90: jis_x0208-1990
+JIS_X0212_90: jis_x0212-1990
+JIS_C6226_78: jis_c6226-1978
 ShiftJIS_X0213_00
-GB_2312_80: gb_2312-80, csGB231280, gb2312-80, gb231280
+GB_2312_80: csgb231280, gb2312-80, gb231280, gb_2312-80
 GBK_95: x-gbk
-GB_18030_2000: GB18030
-KSC_5601_87: KS_C_5601-1987, ks_c_5601_1987, ks_c_5601, ksc5601
+GB_18030_2000: gb18030
+KSC_5601_87: ks_c_5601, ks_c_5601-1987, ks_c_5601_1987, ksc5601
 KSC_5601_92_Johab
 CNS_11643_92_P1
 CNS_11643_92_P2
@@ -134,12 +134,12 @@ ISO_2022_CN_EXT: iso-2022-cn-ext
 ISO_2022_KR: iso-2022-kr
 
 EUC_JP: euc-jp, x-euc, x-euc-jp
-EUC_CN: euc-cn, gb2312, cn-gb, gbk, x-euc-cn
+EUC_CN: cn-gb, euc-cn, gb2312, gbk, x-euc-cn
 EUC_TW: euc-tw
 EUC_KR: euc-kr
 
-ShiftJIS: shift_jis, x-sjis, csWindows31J, shift-jis, x-ms-cp932
-KOI8_R: koi8-r, koi, koi8, koi8r
+ShiftJIS: cswindows31j, shift-jis, shift_jis, x-ms-cp932, x-sjis
+KOI8_R: koi, koi8, koi8-r, koi8r
 Big5: big5, cn-big5, x-x-big5
 MacRomanLatin1: x-mac-roman-latin1
 HZ_GB_2312: hz-gb-2312
diff --git a/WebCore/kwq/make-charset-table.pl b/WebCore/kwq/make-charset-table.pl
index f23c2b6..4d5c51d 100755
--- a/WebCore/kwq/make-charset-table.pl
+++ b/WebCore/kwq/make-charset-table.pl
@@ -54,13 +54,24 @@ sub process_mac_encodings
 
             # Build the aliases list.
             # Also check that no two names are part of the same entry in the charsets file.
-	    my @IANANames = sort split ", ", lc $IANANames;
+	    my @IANANames = split ", ", $IANANames;
+            my $prevName = "";
             for my $name (@IANANames) {
                 if ($name !~ /^[-a-z0-9_]+$/) {
-                    error "$name, in mac-encodings.txt, has illegal characters in it";
+                    if ($name !~ /^[-A-Za-z0-9_]+$/) {
+                        error "$name, in mac-encodings.txt, has illegal characters in it";
+                    } else {
+                        error "$name, in mac-encodings.txt, has capital letters in it";
+                    }
+                    $prevName = $name;
                     next;
                 }
                 
+                if ($name le $prevName) {
+                    error "$name comes after $prevName in mac-encodings.txt, but everything must be in alphabetical order";
+                }
+                $prevName = $name;
+                
                 error "$name is mentioned twice in mac-encodings.txt" if $seenIANANames{$name};
                 $seenIANANames{$name} = 1;
                 
@@ -97,11 +108,6 @@ sub process_mac_encodings
         }
     }
     
-    # Hack, treat -E and -I same as non-suffix case.
-    # Not sure if this does the right thing or not.
-    #$name_to_mac_encoding{"iso-8859-8-e"} = $name_to_mac_encoding{"iso-8859-8"};
-    #$name_to_mac_encoding{"iso-8859-8-i"} = $name_to_mac_encoding{"iso-8859-8"};
-    
     close MAC_ENCODINGS;
 }
 

-- 
WebKit Debian packaging

