INTEGRATION: CWS i18n11 (1.6.70); FILE MERGED

2004/01/06 22:30:46 khong 1.6.70.1: #105745# #107978# #109715# #110835# #112014# #112068# #112094# #112102# #112282# fix Japanese ambiguous search problems

3 files changed, 59 insertions, 55 deletions

diff --git a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
index bcd1e7ef6c23..0efb4533ed18 100644
--- a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ignoreMinusSign_ja_JP.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2003-04-28 16:51:39 $
+ *  last change: $Author: obo $ $Date: 2004-03-17 09:03:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,8 @@ ignoreMinusSign_ja_JP_translator (const sal_Unicode c)
     switch (c) {
         case 0x2212: // MINUS SIGN
         case 0x002d: // HYPHEN-MINUS
+        case 0xff0d: // FULLWIDTH HYPHEN-MINUS
+        case 0xff70: // HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
         return 0x30fc; // KATAKANA-HIRAGANA PROLONGED SOUND MARK
     }
     return c;
diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
index 4d04619efcba..4dc6bb146ecb 100644
--- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ignoreSeparator_ja_JP.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2003-04-28 16:52:09 $
+ *  last change: $Author: obo $ $Date: 2004-03-17 09:03:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,52 +68,52 @@
 namespace com { namespace sun { namespace star { namespace i18n {
 
 OneToOneMappingTable_t ignoreSeparatorTable[] = {
-    MAKE_PAIR( 0x0021, 0x002C ),  // EXCLAMATION MARK
-    MAKE_PAIR( 0x0023, 0x002C ),  // NUMBER SIGN
-    MAKE_PAIR( 0x0024, 0x002C ),  // DOLLAR SIGN
-    MAKE_PAIR( 0x0025, 0x002C ),  // PERCENT SIGN
-    MAKE_PAIR( 0x0026, 0x002C ),  // AMPERSAND
-    MAKE_PAIR( 0x002A, 0x002C ),  // ASTERISK
-    MAKE_PAIR( 0x002B, 0x002C ),  // PLUS SIGN
-    MAKE_PAIR( 0x002C, 0x002C ),  // COMMA
-    MAKE_PAIR( 0x002D, 0x002C ),  // HYPHEN-MINUS
-    MAKE_PAIR( 0x002E, 0x002C ),  // FULL STOP
-    MAKE_PAIR( 0x002F, 0x002C ),  // SOLIDUS
-    MAKE_PAIR( 0x003A, 0x002C ),  // COLON
-    MAKE_PAIR( 0x003B, 0x002C ),  // SEMICOLON
-    MAKE_PAIR( 0x003C, 0x002C ),  // LESS-THAN SIGN
-    MAKE_PAIR( 0x003D, 0x002C ),  // EQUALS SIGN
-    MAKE_PAIR( 0x003E, 0x002C ),  // GREATER-THAN SIGN
-    MAKE_PAIR( 0x005C, 0x002C ),  // REVERSE SOLIDUS
-    MAKE_PAIR( 0x005F, 0x002C ),  // LOW LINE
-    MAKE_PAIR( 0x007B, 0x002C ),  // LEFT CURLY BRACKET
-    MAKE_PAIR( 0x007C, 0x002C ),  // VERTICAL LINE
-    MAKE_PAIR( 0x007D, 0x002C ),  // RIGHT CURLY BRACKET
-    MAKE_PAIR( 0x007E, 0x002C ),  // TILDE
-    MAKE_PAIR( 0x00A5, 0x002C ),  // YEN SIGN
-    MAKE_PAIR( 0xFF01, 0x002C ),  // FULLWIDTH EXCLAMATION MARK
-    MAKE_PAIR( 0xFF03, 0x002C ),  // FULLWIDTH NUMBER SIGN
-    MAKE_PAIR( 0xFF04, 0x002C ),  // FULLWIDTH DOLLAR SIGN
-    MAKE_PAIR( 0xFF05, 0x002C ),  // FULLWIDTH PERCENT SIGN
-    MAKE_PAIR( 0xFF06, 0x002C ),  // FULLWIDTH AMPERSAND
-    MAKE_PAIR( 0xFF0A, 0x002C ),  // FULLWIDTH ASTERISK
-    MAKE_PAIR( 0xFF0B, 0x002C ),  // FULLWIDTH PLUS SIGN
-    MAKE_PAIR( 0xFF0C, 0x002C ),  // FULLWIDTH COMMA
-    MAKE_PAIR( 0xFF0D, 0x002C ),  // FULLWIDTH HYPHEN-MINUS
-    MAKE_PAIR( 0xFF0E, 0x002C ),  // FULLWIDTH FULL STOP
-    MAKE_PAIR( 0xFF0F, 0x002C ),  // FULLWIDTH SOLIDUS
-    MAKE_PAIR( 0xFF1A, 0x002C ),  // FULLWIDTH COLON
-    MAKE_PAIR( 0xFF1B, 0x002C ),  // FULLWIDTH SEMICOLON
-    MAKE_PAIR( 0xFF1C, 0x002C ),  // FULLWIDTH LESS-THAN SIGN
-    MAKE_PAIR( 0xFF1D, 0x002C ),  // FULLWIDTH EQUALS SIGN
-    MAKE_PAIR( 0xFF1E, 0x002C ),  // FULLWIDTH GREATER-THAN SIGN
-    MAKE_PAIR( 0xFF3C, 0x002C ),  // FULLWIDTH REVERSE SOLIDUS
-    MAKE_PAIR( 0xFF3F, 0x002C ),  // FULLWIDTH LOW LINE
-    MAKE_PAIR( 0xFF5B, 0x002C ),  // FULLWIDTH LEFT CURLY BRACKET
-    MAKE_PAIR( 0xFF5C, 0x002C ),  // FULLWIDTH VERTICAL LINE
-    MAKE_PAIR( 0xFF5D, 0x002C ),  // FULLWIDTH RIGHT CURLY BRACKET
-    MAKE_PAIR( 0xFF5E, 0x002C ),  // FULLWIDTH TILDE
-    MAKE_PAIR( 0xFFE5, 0x002C ),  // FULLWIDTH YEN SIGN
+    MAKE_PAIR( 0x0021, 0xFFFF ),  // EXCLAMATION MARK
+    MAKE_PAIR( 0x0023, 0xFFFF ),  // NUMBER SIGN
+    MAKE_PAIR( 0x0024, 0xFFFF ),  // DOLLAR SIGN
+    MAKE_PAIR( 0x0025, 0xFFFF ),  // PERCENT SIGN
+    MAKE_PAIR( 0x0026, 0xFFFF ),  // AMPERSAND
+    MAKE_PAIR( 0x002A, 0xFFFF ),  // ASTERISK
+    MAKE_PAIR( 0x002B, 0xFFFF ),  // PLUS SIGN
+    MAKE_PAIR( 0x002C, 0xFFFF ),  // COMMA
+    MAKE_PAIR( 0x002D, 0xFFFF ),  // HYPHEN-MINUS
+    MAKE_PAIR( 0x002E, 0xFFFF ),  // FULL STOP
+    MAKE_PAIR( 0x002F, 0xFFFF ),  // SOLIDUS
+    MAKE_PAIR( 0x003A, 0xFFFF ),  // COLON
+    MAKE_PAIR( 0x003B, 0xFFFF ),  // SEMICOLON
+    MAKE_PAIR( 0x003C, 0xFFFF ),  // LESS-THAN SIGN
+    MAKE_PAIR( 0x003D, 0xFFFF ),  // EQUALS SIGN
+    MAKE_PAIR( 0x003E, 0xFFFF ),  // GREATER-THAN SIGN
+    MAKE_PAIR( 0x005C, 0xFFFF ),  // REVERSE SOLIDUS
+    MAKE_PAIR( 0x005F, 0xFFFF ),  // LOW LINE
+    MAKE_PAIR( 0x007B, 0xFFFF ),  // LEFT CURLY BRACKET
+    MAKE_PAIR( 0x007C, 0xFFFF ),  // VERTICAL LINE
+    MAKE_PAIR( 0x007D, 0xFFFF ),  // RIGHT CURLY BRACKET
+    MAKE_PAIR( 0x007E, 0xFFFF ),  // TILDE
+    MAKE_PAIR( 0x00A5, 0xFFFF ),  // YEN SIGN
+    MAKE_PAIR( 0xFF01, 0xFFFF ),  // FULLWIDTH EXCLAMATION MARK
+    MAKE_PAIR( 0xFF03, 0xFFFF ),  // FULLWIDTH NUMBER SIGN
+    MAKE_PAIR( 0xFF04, 0xFFFF ),  // FULLWIDTH DOLLAR SIGN
+    MAKE_PAIR( 0xFF05, 0xFFFF ),  // FULLWIDTH PERCENT SIGN
+    MAKE_PAIR( 0xFF06, 0xFFFF ),  // FULLWIDTH AMPERSAND
+    MAKE_PAIR( 0xFF0A, 0xFFFF ),  // FULLWIDTH ASTERISK
+    MAKE_PAIR( 0xFF0B, 0xFFFF ),  // FULLWIDTH PLUS SIGN
+    MAKE_PAIR( 0xFF0C, 0xFFFF ),  // FULLWIDTH COMMA
+    MAKE_PAIR( 0xFF0D, 0xFFFF ),  // FULLWIDTH HYPHEN-MINUS
+    MAKE_PAIR( 0xFF0E, 0xFFFF ),  // FULLWIDTH FULL STOP
+    MAKE_PAIR( 0xFF0F, 0xFFFF ),  // FULLWIDTH SOLIDUS
+    MAKE_PAIR( 0xFF1A, 0xFFFF ),  // FULLWIDTH COLON
+    MAKE_PAIR( 0xFF1B, 0xFFFF ),  // FULLWIDTH SEMICOLON
+    MAKE_PAIR( 0xFF1C, 0xFFFF ),  // FULLWIDTH LESS-THAN SIGN
+    MAKE_PAIR( 0xFF1D, 0xFFFF ),  // FULLWIDTH EQUALS SIGN
+    MAKE_PAIR( 0xFF1E, 0xFFFF ),  // FULLWIDTH GREATER-THAN SIGN
+    MAKE_PAIR( 0xFF3C, 0xFFFF ),  // FULLWIDTH REVERSE SOLIDUS
+    MAKE_PAIR( 0xFF3F, 0xFFFF ),  // FULLWIDTH LOW LINE
+    MAKE_PAIR( 0xFF5B, 0xFFFF ),  // FULLWIDTH LEFT CURLY BRACKET
+    MAKE_PAIR( 0xFF5C, 0xFFFF ),  // FULLWIDTH VERTICAL LINE
+    MAKE_PAIR( 0xFF5D, 0xFFFF ),  // FULLWIDTH RIGHT CURLY BRACKET
+    MAKE_PAIR( 0xFF5E, 0xFFFF ),  // FULLWIDTH TILDE
+    MAKE_PAIR( 0xFFE5, 0xFFFF ),  // FULLWIDTH YEN SIGN
 };
 
 ignoreSeparator_ja_JP::ignoreSeparator_ja_JP()
diff --git a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
index 13127911646a..da73dcd71479 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ignoreTraditionalKanji_ja_JP.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2003-04-28 16:52:58 $
+ *  last change: $Author: obo $ $Date: 2004-03-17 09:03:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -174,15 +174,17 @@ OneToOneMappingTable_t traditionalKanji2updateKanji[] = {
     MAKE_PAIR( 0x5AFB, 0x5AFA ),
     MAKE_PAIR( 0x5B43, 0x5B22 ),
     MAKE_PAIR( 0x5B78, 0x5B66 ),
-    MAKE_PAIR( 0x5B9D, 0x73CD ),
+    //    MAKE_PAIR( 0x5B9D, 0x73CD ),
     MAKE_PAIR( 0x5BC3, 0x51A4 ),
     MAKE_PAIR( 0x5BC7, 0x51A6 ),
     MAKE_PAIR( 0x5BC9, 0x9DB4 ),
     MAKE_PAIR( 0x5BE2, 0x5BDD ),
     MAKE_PAIR( 0x5BE6, 0x5B9F ),
     MAKE_PAIR( 0x5BEB, 0x5199 ),
-    MAKE_PAIR( 0x5BF3, 0x73CD ),
-    MAKE_PAIR( 0x5BF6, 0x73CD ),
+    //MAKE_PAIR( 0x5BF3, 0x73CD ),
+    MAKE_PAIR( 0x5BF3, 0x5B9D ),
+    //MAKE_PAIR( 0x5BF6, 0x73CD ),
+    MAKE_PAIR( 0x5BF6, 0x5B9D ),
     MAKE_PAIR( 0x5C05, 0x524B ),
     MAKE_PAIR( 0x5C07, 0x5C06 ),
     MAKE_PAIR( 0x5C08, 0x5C02 ),