From 0627b9183ad4c5e2d5718eb39772708b077c33f0 Mon Sep 17 00:00:00 2001 From: PyYoshi Date: Sat, 7 Jul 2012 11:13:39 +0900 Subject: [PATCH] fix lowercase --- .../mozilla/extensions/universalchardet/src/base/JpCntx.cpp | 6 +++--- .../universalchardet/src/base/LangBulgarianModel.cpp | 2 +- .../universalchardet/src/base/LangCyrillicModel.cpp | 2 +- .../extensions/universalchardet/src/base/LangCzechModel.cpp | 2 +- .../universalchardet/src/base/LangHebrewModel.cpp | 2 +- .../universalchardet/src/base/LangHungarianModel.cpp | 2 +- .../universalchardet/src/base/LangPolishModel.cpp | 2 +- .../universalchardet/src/base/LangSpanishModel.cpp | 2 +- .../extensions/universalchardet/src/base/nsEUCTWProber.h | 3 ++- .../extensions/universalchardet/src/base/nsGB2312Prober.h | 2 +- .../extensions/universalchardet/src/base/nsHebrewProber.cpp | 2 +- .../extensions/universalchardet/src/base/nsLatin1Prober.h | 2 +- .../extensions/universalchardet/src/base/nsMBCSSM.cpp | 2 +- .../extensions/universalchardet/src/base/nsSJISProber.h | 2 +- 14 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.cpp index 7da0413..ecf8087 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.cpp @@ -195,15 +195,15 @@ float JapaneseContextAnalysis::GetConfidence(void) PRInt32 SJISContextAnalysis::GetOrder(const char* str, PRUint32 *charLen) { //find out current char's byte length - if ((unsigned char)*str >= (unsigned char)0x81 && (unsigned char)*str <= (unsigned char)0x9f || + if ((unsigned char)*str >= (unsigned char)0x81 && (unsigned char)*str <= (unsigned char)0x9f || (unsigned char)*str >= (unsigned char)0xe0 && (unsigned char)*str <= (unsigned char)0xfc ) *charLen = 2; else *charLen = 1; //return its order if it is hiragana - if (*str == '\202' && - (unsigned char)*(str+1) >= (unsigned char)0x9f && + if (*str == '\202' && + (unsigned char)*(str+1) >= (unsigned char)0x9f && (unsigned char)*(str+1) <= (unsigned char)0xf1) return (unsigned char)*(str+1) - (unsigned char)0x9f; return -1; diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangBulgarianModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangBulgarianModel.cpp index 1cc6342..4bfbad7 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangBulgarianModel.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangBulgarianModel.cpp @@ -242,6 +242,6 @@ const SequenceModel Win1251BulgarianModel = BulgarianLangModel, (float)0.969392, PR_FALSE, - "windows-1251", + "WINDOWS-1251", "Bulgarian" }; diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCyrillicModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCyrillicModel.cpp index 840a2da..d2ef444 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCyrillicModel.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCyrillicModel.cpp @@ -316,7 +316,7 @@ const SequenceModel Win1251Model = RussianLangModel, (float)0.976601, PR_FALSE, - "windows-1251", + "WINDOWS-1251", "Russian" }; diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCzechModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCzechModel.cpp index f5a3489..b949c9e 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCzechModel.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCzechModel.cpp @@ -195,6 +195,6 @@ const SequenceModel iso_8859_2czechModel = czechLangModel, (float)0.968107, PR_TRUE, - "iso-8859-2", + "ISO-8859-2", "czech" }; diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHebrewModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHebrewModel.cpp index df3ab54..5427c74 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHebrewModel.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHebrewModel.cpp @@ -214,7 +214,7 @@ const SequenceModel Win1255Model = HebrewLangModel, (float)0.984004, PR_FALSE, - "windows-1255", + "WINDOWS-1255", "Hebrew" }; diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHungarianModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHungarianModel.cpp index 0dc87d1..7c221f6 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHungarianModel.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHungarianModel.cpp @@ -239,6 +239,6 @@ const SequenceModel Win1250HungarianModel = HungarianLangModel, (float)0.965178, PR_TRUE, - "windows-1250", + "WINDOWS-1250", "hungarian" }; diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangPolishModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangPolishModel.cpp index b9749e0..d247fa8 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangPolishModel.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangPolishModel.cpp @@ -195,6 +195,6 @@ const SequenceModel iso_8859_2polishModel = polishLangModel, (float)0.974309, PR_TRUE, - "iso-8859-2", + "ISO-8859-2", "polish" }; diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSpanishModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSpanishModel.cpp index 9a367c5..dc3862f 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSpanishModel.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSpanishModel.cpp @@ -195,6 +195,6 @@ const SequenceModel windows_1252spanishModel = spanishLangModel, (float)0.983906, PR_TRUE, - "windows-1252", + "WINDOWS-1252", "spanish" }; diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h index 911d50b..d7acd40 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h @@ -50,7 +50,8 @@ public: Reset();} virtual ~nsEUCTWProber(void){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "x-euc-tw";} + const char* GetCharSetName() {return "EUC-TW";} + //const char* GetCharSetName() {return "x-euc-tw";} nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h index 4bdac3b..4d6cd56 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h @@ -52,7 +52,7 @@ public: Reset();} virtual ~nsGB18030Prober(void){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "gb18030";} + const char* GetCharSetName() {return "GB18030";} nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.cpp index b148ce3..c503617 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.cpp @@ -59,7 +59,7 @@ #define MIN_MODEL_DISTANCE (0.01) #define VISUAL_HEBREW_NAME ("ISO-8859-8") -#define LOGICAL_HEBREW_NAME ("windows-1255") +#define LOGICAL_HEBREW_NAME ("WINDOWS-1255") PRBool nsHebrewProber::isFinal(char c) { diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h index 5145e96..59118a7 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h @@ -48,7 +48,7 @@ public: nsLatin1Prober(void){Reset();} virtual ~nsLatin1Prober(void){} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "windows-1252";} + const char* GetCharSetName() {return "WINDOWS-1252";} nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void); diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSSM.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSSM.cpp index 584e931..02cc5cc 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSSM.cpp +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSSM.cpp @@ -430,7 +430,7 @@ const SMModel SJISSMModel = { 6, {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, SJIS_st }, SJISCharLenTable, - "Shift_JIS", + "SHIFT_JIS", }; diff --git a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.h index 1efb6e3..f326ded 100644 --- a/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.h +++ b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.h @@ -57,7 +57,7 @@ public: Reset();} virtual ~nsSJISProber(void){delete mCodingSM;} nsProbingState HandleData(const char* aBuf, PRUint32 aLen); - const char* GetCharSetName() {return "Shift_JIS";} + const char* GetCharSetName() {return "SHIFT_JIS";} nsProbingState GetState(void) {return mState;} void Reset(void); float GetConfidence(void);