diff --git a/icu4c/data/ja_JP_JIS.txt b/icu4c/data/ja_JP_JIS.txt
index 46e14cc0f6b..aa1819cb7b9 100644
--- a/icu4c/data/ja_JP_JIS.txt
+++ b/icu4c/data/ja_JP_JIS.txt
@@ -6,239 +6,588 @@
 // *******************************************************************************
 
 ja_JP_JIS {
-    CollationElements { 
-        Version { "3.0" }
-        Sequence {
-        "[strength 4][hiraganaQ on]"
-        "&\u309e=\u309e"
-        "&\u309d=\u309d"
+CollationElements {
+ Version { "3.0" }
+ Sequence {
+	    "[strength 4][hiraganaQ on]"
 
-        "&\u30fc=\uff70" // KATAKANA-HIRAGANA PROLONGED SOUND MARK
+		// Rules for treating length mark
 
-        "&\u3099=\uff9e" // VOICED SOUND MARK
-        "&\u309a=\uff9f" // SEMI-VOICED SOUND MARK
+		"&[before 3]\u30A1" //KATAKANA LETTER SMALL A
+		 "<<< \u30A1|\u30FC   = \uFF67|\u30FC   = \u3041|\u30FC" //  A
+		   "= \u30A2|\u30FC   = \uFF71|\u30FC   = \u3042|\u30FC" //  A
+		   "= \u30AB|\u30FC   = \uFF76|\u30FC   = \u304B|\u30FC" //  KA
+		   "= \u30AC|\u30FC   = \u304C|\u30FC" //  GA
+		   "= \u30B5|\u30FC   = \uFF7B|\u30FC   = \u3055|\u30FC" //  SA
+		   "= \u30B6|\u30FC   = \u3056|\u30FC" //  ZA
+		   "= \u30BF|\u30FC   = \uFF80|\u30FC   = \u305F|\u30FC" //  TA
+		   "= \u30C0|\u30FC   = \u3060|\u30FC" //  DA
+		   "= \u30CA|\u30FC   = \uFF85|\u30FC   = \u306A|\u30FC" //  NA
+		   "= \u30CF|\u30FC   = \uFF8A|\u30FC   = \u306F|\u30FC" //  HA
+		   "= \u30D0|\u30FC   = \u3070|\u30FC" //  BA
+		   "= \u30D1|\u30FC   = \u3071|\u30FC" //  PA
+		   "= \u30DE|\u30FC   = \uFF8F|\u30FC   = \u307E|\u30FC" //  MA
+		   "= \u30E3|\u30FC   = \uFF6C|\u30FC   = \u3083|\u30FC" //  YA
+		   "= \u30E4|\u30FC   = \uFF94|\u30FC   = \u3084|\u30FC" //  YA
+		   "= \u30E9|\u30FC   = \uFF97|\u30FC   = \u3089|\u30FC" //  RA
+		   "= \u30EE|\u30FC   = \u308E|\u30FC" //  WA
+		   "= \u30EF|\u30FC   = \uFF9C|\u30FC   = \u308F|\u30FC" //  WA
+		   "= \u30F5|\u30FC" //  KA
+		   "= \u30F7|\u30FC" //  VA
 
-        "&[before 3]\u30a1"
-        "<<<\u30a1|\u30fc=\u30a2|\u30fc=\u30ab|\u30fc=\u30f5|\u30fc"
-          "=\u30b5|\u30fc=\u30bf|\u30fc=\u30ca|\u30fc=\u30cf|\u30fc"
-          "=\u30de|\u30fc=\u30e3|\u30fc=\u30e4|\u30fc=\u30e9|\u30fc"
-          "=\u30ef|\u30fc=\u30ee|\u30fc"
-          "=\u30ab\u3099|\u30fc=\u30b5\u3099|\u30fc=\u30bf\u3099|\u30fc=\u30cf\u3099|\u30fc"
-          "=\u30cf\u309a|\u30fc"
-          "=\u3041|\u30fc=\u3042|\u30fc=\u304b|\u30fc=\u3095|\u30fc"
-          "=\u3055|\u30fc=\u305f|\u30fc=\u306a|\u30fc=\u306f|\u30fc"
-          "=\u307e|\u30fc=\u3083|\u30fc=\u3084|\u30fc=\u3089|\u30fc"
-          "=\u308f|\u30fc=\u308e|\u30fc"
-          "=\u304b\u3099|\u30fc=\u3055\u3099|\u30fc=\u305f\u3099|\u30fc=\u306f\u3099|\u30fc"
-          "=\u306f\u309a|\u30fc"
+		"&[before 3]\u30A3" //KATAKANA LETTER SMALL I
+		 "<<< \u30A3|\u30FC   = \uFF68|\u30FC   = \u3043|\u30FC" //  I
+		   "= \u30A4|\u30FC   = \uFF72|\u30FC   = \u3044|\u30FC" //  I
+		   "= \u30AD|\u30FC   = \uFF77|\u30FC   = \u304D|\u30FC" //  KI
+		   "= \u30AE|\u30FC   = \u304E|\u30FC" //  GI
+		   "= \u30B7|\u30FC   = \uFF7C|\u30FC   = \u3057|\u30FC" //  SI
+		   "= \u30B8|\u30FC   = \u3058|\u30FC" //  ZI
+		   "= \u30C1|\u30FC   = \uFF81|\u30FC   = \u3061|\u30FC" //  TI
+		   "= \u30C2|\u30FC   = \u3062|\u30FC" //  DI
+		   "= \u30CB|\u30FC   = \uFF86|\u30FC   = \u306B|\u30FC" //  NI
+		   "= \u30D2|\u30FC   = \uFF8B|\u30FC   = \u3072|\u30FC" //  HI
+		   "= \u30D3|\u30FC   = \u3073|\u30FC" //  BI
+		   "= \u30D4|\u30FC   = \u3074|\u30FC" //  PI
+		   "= \u30DF|\u30FC   = \uFF90|\u30FC   = \u307F|\u30FC" //  MI
+		   "= \u30EA|\u30FC   = \uFF98|\u30FC   = \u308A|\u30FC" //  RI
+		   "= \u30F0|\u30FC   = \u3090|\u30FC" //  WI
+		   "= \u30F8|\u30FC" //  VI
 
-        "&[before 3]\u30a3"
-        "<<<\u30a3|\u30fc=\u30a4|\u30fc=\u30ad|\u30fc=\u30b7|\u30fc"
-          "=\u30c1|\u30fc=\u30cb|\u30fc=\u30d2|\u30fc=\u30df|\u30fc"
-          "=\u30ea|\u30fc=\u30f0|\u30fc"
-          "=\u30ad\u3099|\u30fc=\u30b7\u3099|\u30fc=\u30c1\u3099|\u30fc"
-          "=\u30d2\u3099|\u30fc=\u30f0\u3099\u30fc"
-          "=\u30d2\u309a\u30fc"
-          "=\u3043|\u30fc=\u3044|\u30fc=\u304d|\u30fc=\u3057|\u30fc"
-          "=\u3061|\u30fc=\u306b|\u30fc=\u3072|\u30fc=\u307f|\u30fc"
-          "=\u308a|\u30fc=\u3090|\u30fc"
-          "=\u304d\u3099|\u30fc=\u3057\u3099|\u30fc=\u3061\u3099|\u30fc"
-          "=\u3072\u3099|\u30fc=\u3090\u3099\u30fc"
-          "=\u3072\u309a|\u30fc"
+		"&[before 3]\u30A5" //KATAKANA LETTER SMALL U
+		 "<<< \u30A5|\u30FC   = \uFF69|\u30FC   = \u3045|\u30FC" //  U
+		   "= \u30A6|\u30FC   = \uFF73|\u30FC   = \u3046|\u30FC" //  U
+		   "= \u30AF|\u30FC   = \uFF78|\u30FC   = \u304F|\u30FC" //  KU
+		   "= \u30B0|\u30FC   = \u3050|\u30FC" //  GU
+		   "= \u30B9|\u30FC   = \uFF7D|\u30FC   = \u3059|\u30FC" //  SU
+		   "= \u30BA|\u30FC   = \u305A|\u30FC" //  ZU
+		   "= \u30C3|\u30FC   = \uFF6F|\u30FC   = \u3063|\u30FC" //  TU
+		   "= \u30C4|\u30FC   = \uFF82|\u30FC   = \u3064|\u30FC" //  TU
+		   "= \u30C5|\u30FC   = \u3065|\u30FC" //  DU
+		   "= \u30CC|\u30FC   = \uFF87|\u30FC   = \u306C|\u30FC" //  NU
+		   "= \u30D5|\u30FC   = \uFF8C|\u30FC   = \u3075|\u30FC" //  HU
+		   "= \u30D6|\u30FC   = \u3076|\u30FC" //  BU
+		   "= \u30D7|\u30FC   = \u3077|\u30FC" //  PU
+		   "= \u30E0|\u30FC   = \uFF91|\u30FC   = \u3080|\u30FC" //  MU
+		   "= \u30E5|\u30FC   = \uFF6D|\u30FC   = \u3085|\u30FC" //  YU
+		   "= \u30E6|\u30FC   = \uFF95|\u30FC   = \u3086|\u30FC" //  YU
+		   "= \u30EB|\u30FC   = \uFF99|\u30FC   = \u308B|\u30FC" //  RU
+		   "= \u30F4|\u30FC   = \u3094|\u30FC" //  VU
 
-        "&[before 3]\u30a5"
-        "<<<\u30a5|\u30fc=\u30a6|\u30fc=\u30af|\u30fc=\u30b9|\u30fc"
-          "=\u30c4|\u30fc=\u30c3|\u30fc=\u30cc|\u30fc=\u30d5|\u30fc"
-          "=\u30e0|\u30fc=\u30e5|\u30fc=\u30e6|\u30fc=\u30eb|\u30fc"
-          "=\u30af\u3099|\u30fc=\u30b9\u3099|\u30fc=\u30c4\u3099|\u30fc"
-          "=\u30d5\u3099|\u30fc=\u30a6\u3099|\u30fc"
-          "=\u30d5\u309a\u30fc"
-          "=\u3045|\u30fc=\u3046|\u30fc=\u304f|\u30fc=\u3059|\u30fc"
-          "=\u3064|\u30fc=\u3063|\u30fc=\u306c|\u30fc=\u3075|\u30fc"
-          "=\u3080|\u30fc=\u3085|\u30fc=\u3086|\u30fc=\u308b|\u30fc"
-          "=\u304f\u3099|\u30fc=\u3059\u3099|\u30fc=\u3064\u3099|\u30fc"
-          "=\u3075\u3099|\u30fc=\u3046\u3099|\u30fc"
-          "=\u3075\u309a|\u30fc"
+		"&[before 3]\u30A7" //KATAKANA LETTER SMALL E
+		 "<<< \u30A7|\u30FC   = \uFF6A|\u30FC   = \u3047|\u30FC" //  E
+		   "= \u30A8|\u30FC   = \uFF74|\u30FC   = \u3048|\u30FC" //  E
+		   "= \u30B1|\u30FC   = \uFF79|\u30FC   = \u3051|\u30FC" //  KE
+		   "= \u30B2|\u30FC   = \u3052|\u30FC" //  GE
+		   "= \u30BB|\u30FC   = \uFF7E|\u30FC   = \u305B|\u30FC" //  SE
+		   "= \u30BC|\u30FC   = \u305C|\u30FC" //  ZE
+		   "= \u30C6|\u30FC   = \uFF83|\u30FC   = \u3066|\u30FC" //  TE
+		   "= \u30C7|\u30FC   = \u3067|\u30FC" //  DE
+		   "= \u30CD|\u30FC   = \uFF88|\u30FC   = \u306D|\u30FC" //  NE
+		   "= \u30D8|\u30FC   = \uFF8D|\u30FC   = \u3078|\u30FC" //  HE
+		   "= \u30D9|\u30FC   = \u3079|\u30FC" //  BE
+		   "= \u30DA|\u30FC   = \u307A|\u30FC" //  PE
+		   "= \u30E1|\u30FC   = \uFF92|\u30FC   = \u3081|\u30FC" //  ME
+		   "= \u30EC|\u30FC   = \uFF9A|\u30FC   = \u308C|\u30FC" //  RE
+		   "= \u30F1|\u30FC   = \u3091|\u30FC" //  WE
+		   "= \u30F6|\u30FC" //  KE
+		   "= \u30F9|\u30FC" //  VE
 
-        "&[before 3]\u30a7"
-        "<<<\u30a7|\u30fc=\u30a8|\u30fc=\u30b1|\u30fc=\u30f6|\u30fc"
-          "=\u30bb|\u30fc=\u30c6|\u30fc=\u30cd|\u30fc=\u30d8|\u30fc"
-          "=\u30e1|\u30fc=\u30ec|\u30fc=\u30f1|\u30fc"
-          "=\u30b1\u3099|\u30fc=\u30bb\u3099|\u30fc=\u30c6\u3099|\u30fc"
-          "=\u30d8\u3099|\u30fc=\u30f1\u3099|\u30fc"
-          "=\u30d8\u309a|\u30fc"
-          "=\u3047|\u30fc=\u3048|\u30fc=\u3051|\u30fc=\u3096|\u30fc"
-          "=\u305b|\u30fc=\u3066|\u30fc=\u306d|\u30fc=\u3078|\u30fc"
-          "=\u3081|\u30fc=\u308c|\u30fc=\u3091|\u30fc"
-          "=\u3051\u3099|\u30fc=\u305b\u3099|\u30fc=\u3066\u3099|\u30fc"
-          "=\u3078\u3099|\u30fc=\u3091\u3099|\u30fc"
-          "=\u3078\u309a|\u30fc"
+		"&[before 3]\u30A9" //KATAKANA LETTER SMALL O
+		 "<<< \u30A9|\u30FC   = \uFF6B|\u30FC   = \u3049|\u30FC" //  O
+		   "= \u30AA|\u30FC   = \uFF75|\u30FC   = \u304A|\u30FC" //  O
+		   "= \u30B3|\u30FC   = \uFF7A|\u30FC   = \u3053|\u30FC" //  KO
+		   "= \u30B4|\u30FC   = \u3054|\u30FC" //  GO
+		   "= \u30BD|\u30FC   = \uFF7F|\u30FC   = \u305D|\u30FC" //  SO
+		   "= \u30BE|\u30FC   = \u305E|\u30FC" //  ZO
+		   "= \u30C8|\u30FC   = \uFF84|\u30FC   = \u3068|\u30FC" //  TO
+		   "= \u30C9|\u30FC   = \u3069|\u30FC" //  DO
+		   "= \u30CE|\u30FC   = \uFF89|\u30FC   = \u306E|\u30FC" //  NO
+		   "= \u30DB|\u30FC   = \uFF8E|\u30FC   = \u307B|\u30FC" //  HO
+		   "= \u30DC|\u30FC   = \u307C|\u30FC" //  BO
+		   "= \u30DD|\u30FC   = \u307D|\u30FC" //  PO
+		   "= \u30E2|\u30FC   = \uFF93|\u30FC   = \u3082|\u30FC" //  MO
+		   "= \u30E7|\u30FC   = \uFF6E|\u30FC   = \u3087|\u30FC" //  YO
+		   "= \u30E8|\u30FC   = \uFF96|\u30FC   = \u3088|\u30FC" //  YO
+		   "= \u30ED|\u30FC   = \uFF9B|\u30FC   = \u308D|\u30FC" //  RO
+		   "= \u30F2|\u30FC   = \uFF66|\u30FC   = \u3092|\u30FC" //  WO
+		   "= \u30FA|\u30FC" //  VO
 
-        "&[before 3]\u30a9"
-        "<<<\u30a9|\u30fc=\u30aa|\u30fc=\u30b3|\u30fc=\u30bd|\u30fc"
-          "=\u30c8|\u30fc=\u30ce|\u30fc=\u30db|\u30fc=\u30e2|\u30fc"
-          "=\u30e7|\u30fc=\u30e8|\u30fc=\u30ed|\u30fc=\u30f2|\u30fc"
-          "=\u30b3\u3099|\u30fc=\u30bd\u3099|\u30fc=\u30c8\u3099|\u30fc"
-          "=\u30db\u3099|\u30fc=\u30f2\u3099|\u30fc"
-          "=\u30db\u309a|\u30fc=\u30db\u309a|\u30fc"
-          "=\u3049|\u30fc=\u304a|\u30fc=\u3053|\u30fc=\u305d|\u30fc"
-          "=\u3068|\u30fc=\u306e|\u30fc=\u307b|\u30fc=\u3082|\u30fc"
-          "=\u3087|\u30fc=\u3088|\u30fc=\u308d|\u30fc=\u3092|\u30fc"
-          "=\u3053\u3099|\u30fc=\u305d\u3099|\u30fc=\u3068\u3099|\u30fc"
-          "=\u307b\u3099|\u30fc=\u3092\u3099|\u30fc"
-          "=\u307b\u309a|\u30fc=\u307b\u309a|\u30fc"
+		// Rules for treating iteration mark
 
-        // Iteration mark - these should probably go as a tertiary difference above
+		"&[before 3]\u30A2" //KATAKANA LETTER A
+		 "<<< \u30A2|\u30FD = \uFF71|\u30FD = \u3042|\u309D"
+		   "= \u30A1|\u30FD = \uFF67|\u30FD = \u3041|\u309D"
 
-        "&[before 3]\u30a2<<<\u30a2|\u30fd=\u3042|\u309d" // A
-        "=\u30a1|\u30fd=\u3041|\u309d"                    // SMALL A
+		"&[before 3]\u30A4" //KATAKANA LETTER I
+		 "<<< \u30A4|\u30FD = \uFF72|\u30FD = \u3044|\u309D"
+		   "= \u30A3|\u30FD = \uFF68|\u30FD = \u3043|\u309D"
 
-        "&[before 3]\u30a4<<<\u30a4|\u30fd=\u3044|\u309d" // I
-        "=\u30a3|\u30fd=\u3043|\u309d"                    // SMALL I
+		"&[before 3]\u30A6" //KATAKANA LETTER U
+		 "<<< \u30A6|\u30FD = \uFF73|\u30FD = \u3046|\u309D"
+		   "= \u30A5|\u30FD = \uFF69|\u30FD = \u3045|\u309D"
+		   "= \u30F4|\u30FD = \u3094|\u309D"
+		   "= \u30A6|\u30FE/\u3099 = \uFF73|\u30FE/\u3099 = \u3046|\u309E/\u3099"
+		   "= \u30A5|\u30FE/\u3099 = \uFF69|\u30FE/\u3099 = \u3045|\u309E/\u3099"
+		   "= \u30F4|\u30FE/\u3099 = \u3094|\u309E/\u3099"
 
-        "&[before 3]\u30a6<<<\u30a6|\u30fd=\u3046|\u309d"  // U
-        "=\u30a5|\u30fd=\u3045|\u309d"                    // SMALL U
+		"&[before 3]\u30A8" //KATAKANA LETTER E
+		 "<<< \u30A8|\u30FD = \uFF74|\u30FD = \u3048|\u309D"
+		   "= \u30A7|\u30FD = \uFF6A|\u30FD = \u3047|\u309D"
 
-        "&[before 3]\u30a8<<<\u30a8|\u30fd=\u3048|\u309d" // E
-        "=\u30a7|\u30fd=\u3047|\u309d"                    // SMALL E
+		"&[before 3]\u30AA" //KATAKANA LETTER O
+		 "<<< \u30AA|\u30FD = \uFF75|\u30FD = \u304A|\u309D"
+		   "= \u30A9|\u30FD = \uFF6B|\u30FD = \u3049|\u309D"
 
-        "&[before 3]\u30aa<<<\u30aa|\u30fd=\u304a|\u309d" // O
-        "=\u30a9|\u30fd=\u3049|\u309d"                    // SMALL O
+		"&[before 3]\u30AB" //KATAKANA LETTER KA
+		 "<<< \u30AB|\u30FD = \uFF76|\u30FD = \u304B|\u309D"
+		   "= \u30F5|\u30FD"
 
-        // regular syllables
+		"&[before 3]\u30AC" //KATAKANA LETTER GA
+		 "<<< \u30AC|\u30FD = \u304C|\u309D"
 
-        "&[before 3]\u30ab<<<\u30ab|\u30fd=\u30ab\u3099|\u30fd=\u304b|\u309d=\u304b\u3099|\u309d" // KA
-        "=\u30f5|\u30fd" // SMALL KA
-        "=\u30ab|\u30fe/\u3099=\u30ab\u3099|\u30fe/\u3099=\u304b|\u309e/\u3099=\u304b\u3099|\u309e/\u3099" // GA
-        "=\u30f5|\u30fe/\u3099" // SMALL KA FOLLOWED BY A VOICED ITERATION MARK
+		"&[before 3]\u30AD" //KATAKANA LETTER KI
+		 "<<< \u30AD|\u30FD = \uFF77|\u30FD = \u304D|\u309D"
+		   "= \u30AE|\u30FD = \u304E|\u309D"
+		   "= \u30AD|\u30FE/\u3099 = \uFF77|\u30FE/\u3099 = \u304D|\u309E/\u3099"
+		   "= \u30AE|\u30FE/\u3099 = \u304E|\u309E/\u3099"
 
-        "&[before 3]\u30ad<<<\u30ad|\u30fd=\u30ad\u3099|\u30fd=\u304d|\u309d=\u304d\u3099|\u309d" // KI
-        "=\u30ad|\u30fe/\u3099=\u30ad\u3099|\u30fe/\u3099=\u304d|\u309e/\u3099=\u304d\u3099|\u309e/\u3099" // GI
+		"&[before 3]\u30AF" //KATAKANA LETTER KU
+		 "<<< \u30AF|\u30FD = \uFF78|\u30FD = \u304F|\u309D"
+		   "= \u30B0|\u30FD = \u3050|\u309D"
+		   "= \u30AF|\u30FE/\u3099 = \uFF78|\u30FE/\u3099 = \u304F|\u309E/\u3099"
+		   "= \u30B0|\u30FE/\u3099 = \u3050|\u309E/\u3099"
 
-        "&[before 3]\u30af<<<\u30af|\u30fd=\u30af\u3099|\u30fd=\u304f|\u309d=\u304f\u3099|\u309d" // KU
-        "=\u30af|\u30fe/\u3099=\u30af\u3099|\u30fe/\u3099=\u304f|\u309e/\u3099=\u304f\u3099|\u309e/\u3099" // GU
+		"&[before 3]\u30B1" //KATAKANA LETTER KE
+		 "<<< \u30B1|\u30FD = \uFF79|\u30FD = \u3051|\u309D"
+		   "= \u30F6|\u30FD"
 
-        "&[before 3]\u30b1<<<\u30b1|\u30fd=\u30b1\u3099|\u30fd=\u3051|\u309d=\u3051\u3099|\u309d" // KE
-        "=\u30f6|\u30fd" // SMALL KE
-        "=\u30b1|\u30fe/\u3099=\u30b1\u3099|\u30fe/\u3099=\u3051|\u309e/\u3099=\u3051\u3099|\u309e/\u3099" // GE
-        "=\u30f6|\u30fe/\u3099" // SMALL KE FOLLOWED BY A VOICED ITERATION MARK
+		"&[before 3]\u30B2" //KATAKANA LETTER GE
+		 "<<< \u30B2|\u30FD = \u3052|\u309D"
 
-        "&[before 3]\u30b3<<<\u30b3|\u30fd=\u30b3\u3099|\u30fd=\u3053|\u309d=\u3053\u3099|\u309d" // KO
-        "=\u30b3|\u30fe/\u3099=\u30b3\u3099|\u30fe/\u3099=\u3053|\u309e/\u3099=\u3053\u3099|\u309e/\u3099" // GO
+		"&[before 3]\u30B3" //KATAKANA LETTER KO
+		 "<<< \u30B3|\u30FD = \uFF7A|\u30FD = \u3053|\u309D"
+		   "= \u30B4|\u30FD = \u3054|\u309D"
+		   "= \u30B3|\u30FE/\u3099 = \uFF7A|\u30FE/\u3099 = \u3053|\u309E/\u3099"
+		   "= \u30B4|\u30FE/\u3099 = \u3054|\u309E/\u3099"
 
-        "&[before 3]\u30b5<<<\u30b5|\u30fd=\u30b5\u3099|\u30fd=\u3055|\u309d=\u3055\u3099|\u309d" // SA
-        "=\u30b5|\u30fe/\u3099=\u30b5\u3099|\u30fe/\u3099=\u3055|\u309e/\u3099=\u3055\u3099|\u309e/\u3099" // ZA
+		"&[before 3]\u30B5" //KATAKANA LETTER SA
+		 "<<< \u30B5|\u30FD = \uFF7B|\u30FD = \u3055|\u309D"
+		   "= \u30B6|\u30FD = \u3056|\u309D"
+		   "= \u30B5|\u30FE/\u3099 = \uFF7B|\u30FE/\u3099 = \u3055|\u309E/\u3099"
+		   "= \u30B6|\u30FE/\u3099 = \u3056|\u309E/\u3099"
 
-        "&[before 3]\u30b7<<<\u30b7|\u30fd=\u30b7\u3099|\u30fd=\u3057|\u309d=\u3057\u3099|\u309d" // SI
-        "=\u30b7|\u30fe/\u3099=\u30b7\u3099|\u30fe/\u3099=\u3057|\u309e/\u3099=\u3057\u3099|\u309e/\u3099" // ZI
+		"&[before 3]\u30B7" //KATAKANA LETTER SI
+		 "<<< \u30B7|\u30FD = \uFF7C|\u30FD = \u3057|\u309D"
+		   "= \u30B8|\u30FD = \u3058|\u309D"
+		   "= \u30B7|\u30FE/\u3099 = \uFF7C|\u30FE/\u3099 = \u3057|\u309E/\u3099"
+		   "= \u30B8|\u30FE/\u3099 = \u3058|\u309E/\u3099"
 
-        "&[before 3]\u30b9<<<\u30b9|\u30fd=\u30b9\u3099|\u30fd=\u3059|\u309d=\u3059\u3099|\u309d" // SU
-        "=\u30b9|\u30fe/\u3099=\u30b9\u3099|\u30fe/\u3099=\u3059|\u309e/\u3099=\u3059\u3099|\u309e/\u3099" // ZU
+		"&[before 3]\u30B9" //KATAKANA LETTER SU
+		 "<<< \u30B9|\u30FD = \uFF7D|\u30FD = \u3059|\u309D"
+		   "= \u30BA|\u30FD = \u305A|\u309D"
+		   "= \u30B9|\u30FE/\u3099 = \uFF7D|\u30FE/\u3099 = \u3059|\u309E/\u3099"
+		   "= \u30BA|\u30FE/\u3099 = \u305A|\u309E/\u3099"
 
-        "&[before 3]\u30bb<<<\u30bb|\u30fd=\u30bb\u3099|\u30fd=\u305b|\u309d=\u305b\u3099|\u309d" // SE
-        "=\u30bb|\u30fe/\u3099=\u30bb\u3099|\u30fe/\u3099=\u305b|\u309e/\u3099=\u305b\u3099|\u309e/\u3099" // ZE
+		"&[before 3]\u30BB" //KATAKANA LETTER SE
+		 "<<< \u30BB|\u30FD = \uFF7E|\u30FD = \u305B|\u309D"
+		   "= \u30BC|\u30FD = \u305C|\u309D"
+		   "= \u30BB|\u30FE/\u3099 = \uFF7E|\u30FE/\u3099 = \u305B|\u309E/\u3099"
+		   "= \u30BC|\u30FE/\u3099 = \u305C|\u309E/\u3099"
 
-        "&[before 3]\u30bd<<<\u30bd|\u30fd=\u30bd\u3099|\u30fd=\u305d|\u309d=\u305d\u3099|\u309d" // SO
-        "=\u30bd|\u30fe/\u3099=\u30bd\u3099|\u30fe/\u3099=\u305d|\u309e/\u3099=\u305d\u3099|\u309e/\u3099" // ZO
+		"&[before 3]\u30BD" //KATAKANA LETTER SO
+		 "<<< \u30BD|\u30FD = \uFF7F|\u30FD = \u305D|\u309D"
+		   "= \u30BE|\u30FD = \u305E|\u309D"
+		   "= \u30BD|\u30FE/\u3099 = \uFF7F|\u30FE/\u3099 = \u305D|\u309E/\u3099"
+		   "= \u30BE|\u30FE/\u3099 = \u305E|\u309E/\u3099"
 
-        "&[before 3]\u30bf<<<\u30bf|\u30fd=\u30bf\u3099|\u30fd=\u305f|\u309d=\u305f\u3099|\u309d" // TA
-        "=\u30bf|\u30fe/\u3099=\u30bf\u3099|\u30fe/\u3099=\u305f|\u309e/\u3099=\u305f\u3099|\u309e/\u3099" // DA
+		"&[before 3]\u30BF" //KATAKANA LETTER TA
+		 "<<< \u30BF|\u30FD = \uFF80|\u30FD = \u305F|\u309D"
+		   "= \u30C0|\u30FD = \u3060|\u309D"
+		   "= \u30BF|\u30FE/\u3099 = \uFF80|\u30FE/\u3099 = \u305F|\u309E/\u3099"
+		   "= \u30C0|\u30FE/\u3099 = \u3060|\u309E/\u3099"
 
-        "&[before 3]\u30c1<<<\u30c1|\u30fd=\u30c1\u3099|\u30fd=\u3061|\u309d=\u3061\u3099|\u309d" // TI
-        "=\u30c1|\u30fe/\u3099=\u30c1\u3099|\u30fe/\u3099=\u3061|\u309e/\u3099=\u3061\u3099|\u309e/\u3099" // DI
+		"&[before 3]\u30C1" //KATAKANA LETTER TI
+		 "<<< \u30C1|\u30FD = \uFF81|\u30FD = \u3061|\u309D"
+		   "= \u30C2|\u30FD = \u3062|\u309D"
+		   "= \u30C1|\u30FE/\u3099 = \uFF81|\u30FE/\u3099 = \u3061|\u309E/\u3099"
+		   "= \u30C2|\u30FE/\u3099 = \u3062|\u309E/\u3099"
 
-        "&[before 3]\u30c4<<<\u30c4|\u30fd=\u30c4\u3099|\u30fd=\u3064|\u309d=\u3064\u3099|\u309d"
-        "=\u30c3|\u30fd=\u3063|\u309d" // SMALL TU
-        "=\u30c4|\u30fe/\u3099=\u30c4\u3099|\u30fe/\u3099=\u3064|\u309e/\u3099=\u3064\u3099|\u309e/\u3099" // DU
-        "=\u30c3|\u30fe/\u3099=\u3063|\u309e/\u3099" // SMALL TU FOLLOWED BY A VOICED ITERATION MARK
+		"&[before 3]\u30C4" //KATAKANA LETTER TU
+		 "<<< \u30C4|\u30FD = \uFF82|\u30FD = \u3064|\u309D"
+		   "= \u30C3|\u30FD = \uFF6F|\u30FD = \u3063|\u309D"
+		   "= \u30C5|\u30FD = \u3065|\u309D"
+		   "= \u30C4|\u30FE/\u3099 = \uFF82|\u30FE/\u3099 = \u3064|\u309E/\u3099"
+		   "= \u30C5|\u30FE/\u3099 = \u3065|\u309E/\u3099"
+		   "= \u30C4|\u30FD = \uFF82|\u30FD = \u3064|\u309D"
+		   "= \u30C3|\u30FE/\u3099 = \uFF6F|\u30FE/\u3099 = \u3063|\u309E/\u3099"
+		   "= \u30C4|\u30FE/\u3099 = \uFF82|\u30FE/\u3099 = \u3064|\u309E/\u3099"
 
-        "&[before 3]\u30c6<<<\u30c6|\u30fd=\u30c6\u3099|\u30fd=\u3066|\u309d=\u3066\u3099|\u309d" // TE
-        "=\u30c6|\u30fe/\u3099=\u30c6\u3099|\u30fe/\u3099=\u3066|\u309e/\u3099=\u3066\u3099|\u309e/\u3099" // DE
+		"&[before 3]\u30C6" //KATAKANA LETTER TE
+		 "<<< \u30C6|\u30FD = \uFF83|\u30FD = \u3066|\u309D"
+		   "= \u30C7|\u30FD = \u3067|\u309D"
+		   "= \u30C6|\u30FE/\u3099 = \uFF83|\u30FE/\u3099 = \u3066|\u309E/\u3099"
+		   "= \u30C7|\u30FE/\u3099 = \u3067|\u309E/\u3099"
 
-        "&[before 3]\u30c8<<<\u30c8|\u30fd=\u30c8\u3099|\u30fd=\u3068|\u309d=\u3068\u3099|\u309d" // TO
-        "=\u30c8|\u30fe/\u3099=\u30c8\u3099|\u30fe/\u3099=\u3068|\u309e/\u3099=\u3068\u3099|\u309e/\u3099" // DO
+		"&[before 3]\u30C8" //KATAKANA LETTER TO
+		 "<<< \u30C8|\u30FD = \uFF84|\u30FD = \u3068|\u309D"
+		   "= \u30C9|\u30FD = \u3069|\u309D"
+		   "= \u30C8|\u30FE/\u3099 = \uFF84|\u30FE/\u3099 = \u3068|\u309E/\u3099"
+		   "= \u30C9|\u30FE/\u3099 = \u3069|\u309E/\u3099"
 
-        "&[before 3]\u30ca<<<\u30ca|\u30fd=\u306a|\u309d" // NA
+		"&[before 3]\u30CA" //KATAKANA LETTER NA
+		 "<<< \u30CA|\u30FD = \uFF85|\u30FD = \u306A|\u309D"
 
-        "&[before 3]\u30cb<<<\u30cb|\u30fd=\u306b|\u309d" // NI
+		"&[before 3]\u30CB" //KATAKANA LETTER NI
+		 "<<< \u30CB|\u30FD = \uFF86|\u30FD = \u306B|\u309D"
 
-        "&[before 3]\u30cc<<<\u30cc|\u30fd=\u306c|\u309d" // NU
+		"&[before 3]\u30CC" //KATAKANA LETTER NU
+		 "<<< \u30CC|\u30FD = \uFF87|\u30FD = \u306C|\u309D"
 
-        "&[before 3]\u30cd<<<\u30cd|\u30fd=\u306d|\u309d" // NE
+		"&[before 3]\u30CD" //KATAKANA LETTER NE
+		 "<<< \u30CD|\u30FD = \uFF88|\u30FD = \u306D|\u309D"
 
-        "&[before 3]\u30ce<<<\u30ce|\u30fd=\u306e|\u309d" // NO
+		"&[before 3]\u30CE" //KATAKANA LETTER NO
+		 "<<< \u30CE|\u30FD = \uFF89|\u30FD = \u306E|\u309D"
 
-        "&[before 3]\u30cf<<<\u30cf|\u30fd=\u30cf\u3099|\u30fd=\u30cf\u309a|\u30fd"
-        "=\u306f|\u309d=\u306f\u3099|\u309d=\u306f\u309a|\u309d" // HA
-        "=\u30cf|\u30fe/\u3099=\u30cf\u309a|\u30fe/\u3099=\u30cf\u3099|\u30fe/\u3099"
-        "=\u306f|\u309e/\u3099=\u306f\u309a|\u309e/\u3099=\u306f\u3099|\u309e/\u3099" // BA
+		"&[before 3]\u30CF" //KATAKANA LETTER HA
+		 "<<< \u30CF|\u30FD = \uFF8A|\u30FD = \u306F|\u309D"
+		   "= \u30D0|\u30FD = \u3070|\u309D"
+		   "= \u30CF|\u30FE/\u3099 = \uFF8A|\u30FE/\u3099 = \u306F|\u309E/\u3099"
+		   "= \u30D0|\u30FE/\u3099 = \u3070|\u309E/\u3099"
+		   "= \u30D1|\u30FD = \u3071|\u309D"
+		   "= \u30D1|\u30FE/\u3099 = \u3071|\u309E/\u3099"
 
-        "&[before 3]\u30d2<<<\u30d2|\u30fd=\u30d2\u3099|\u30fd=\u30d2\u309a|\u30fd"
-        "=\u3072|\u309d=\u3072\u3099|\u309d=\u3072\u309a|\u309d" // HI
-        "=\u30d2|\u30fe/\u3099=\u30d2\u309a|\u30fe/\u3099=\u30d2\u3099|\u30fe/\u3099"
-        "=\u3072|\u309e/\u3099=\u3072\u309a|\u309e/\u3099=\u3072\u3099|\u309e/\u3099" // BI
+		"&[before 3]\u30D2" //KATAKANA LETTER HI
+		 "<<< \u30D2|\u30FD = \uFF8B|\u30FD = \u3072|\u309D"
+		   "= \u30D3|\u30FD = \u3073|\u309D"
+		   "= \u30D2|\u30FE/\u3099 = \uFF8B|\u30FE/\u3099 = \u3072|\u309E/\u3099"
+		   "= \u30D3|\u30FE/\u3099 = \u3073|\u309E/\u3099"
+		   "= \u30D4|\u30FD = \u3074|\u309D"
+		   "= \u30D4|\u30FE/\u3099 = \u3074|\u309E/\u3099"
 
-        "&[before 3]\u30d5<<<\u30d5|\u30fd=\u30d5\u3099|\u30fd=\u30d5\u309a|\u30fd"
-        "=\u3075|\u309d=\u3075\u3099|\u309d=\u3075\u309a|\u309d" // HU
-        "=\u30d5|\u30fe/\u3099=\u30d5\u309a|\u30fe/\u3099=\u30d5\u3099|\u30fe/\u3099"
-        "=\u3075|\u309e/\u3099=\u3075\u309a|\u309e/\u3099=\u3075\u3099|\u309e/\u3099" // BU
+		"&[before 3]\u30D5" //KATAKANA LETTER HU
+		 "<<< \u30D5|\u30FD = \uFF8C|\u30FD = \u3075|\u309D"
+		   "= \u30D6|\u30FD = \u3076|\u309D"
+		   "= \u30D5|\u30FE/\u3099 = \uFF8C|\u30FE/\u3099 = \u3075|\u309E/\u3099"
+		   "= \u30D6|\u30FE/\u3099 = \u3076|\u309E/\u3099"
+		   "= \u30D7|\u30FD = \u3077|\u309D"
+		   "= \u30D7|\u30FE/\u3099 = \u3077|\u309E/\u3099"
 
-        "&[before 3]\u30d8<<<\u30d8|\u30fd=\u30d8\u3099|\u30fd=\u30d8\u309a|\u30fd"
-        "=\u3078|\u309d=\u3078\u3099|\u309d=\u3078\u309a|\u309d" // HE
-        "=\u30d8|\u30fe/\u3099=\u30d8\u309a|\u30fe/\u3099=\u30d8\u3099|\u30fe/\u3099"
-        "=\u3078|\u309e/\u3099=\u3078\u309a|\u309e/\u3099=\u3078\u3099|\u309e/\u3099" // BE
+		"&[before 3]\u30D8" //KATAKANA LETTER HE
+		 "<<< \u30D8|\u30FD = \uFF8D|\u30FD = \u3078|\u309D"
+		   "= \u30D9|\u30FD = \u3079|\u309D"
+		   "= \u30D8|\u30FE/\u3099 = \uFF8D|\u30FE/\u3099 = \u3078|\u309E/\u3099"
+		   "= \u30D9|\u30FE/\u3099 = \u3079|\u309E/\u3099"
+		   "= \u30DA|\u30FD = \u307A|\u309D"
+		   "= \u30DA|\u30FE/\u3099 = \u307A|\u309E/\u3099"
 
-        "&[before 3]\u30db<<<\u30db|\u30fd=\u30db\u3099|\u30fd=\u30db\u309a|\u30fd"
-        "=\u307b|\u309d=\u307b\u3099|\u309d=\u307b\u309a|\u309d" // HO
-        "=\u30db|\u30fe/\u3099=\u30db\u309a|\u30fe/\u3099=\u30db\u3099|\u30fe/\u3099"
-        "=\u307b|\u309e/\u3099=\u307b\u309a|\u309e/\u3099=\u307b\u3099|\u309e/\u3099" // HO
+		"&[before 3]\u30DB" //KATAKANA LETTER HO
+		 "<<< \u30DB|\u30FD = \uFF8E|\u30FD = \u307B|\u309D"
+		   "= \u30DC|\u30FD = \u307C|\u309D"
+		   "= \u30DB|\u30FE/\u3099 = \uFF8E|\u30FE/\u3099 = \u307B|\u309E/\u3099"
+		   "= \u30DC|\u30FE/\u3099 = \u307C|\u309E/\u3099"
+		   "= \u30DD|\u30FD = \u307D|\u309D"
+		   "= \u30DD|\u30FE/\u3099 = \u307D|\u309E/\u3099"
 
-        "&[before 3]\u30de<<<\u30de|\u30fd=\u307e|\u309d" // MA
+		"&[before 3]\u30DE" //KATAKANA LETTER MA
+		 "<<< \u30DE|\u30FD = \uFF8F|\u30FD = \u307E|\u309D"
 
-        "&[before 3]\u30df<<<\u30df|\u30fd=\u307f|\u309d" // MI
+		"&[before 3]\u30DF" //KATAKANA LETTER MI
+		 "<<< \u30DF|\u30FD = \uFF90|\u30FD = \u307F|\u309D"
 
-        "&[before 3]\u30e0<<<\u30e0|\u30fd=\u3080|\u309d" // MU
+		"&[before 3]\u30E0" //KATAKANA LETTER MU
+		 "<<< \u30E0|\u30FD = \uFF91|\u30FD = \u3080|\u309D"
 
-        "&[before 3]\u30e1<<<\u30e1|\u30fd=\u3081|\u309d" // ME
- 
-        "&[before 3]\u30e2<<<\u30e2|\u30fd=\u3082|\u309d" // MO
+		"&[before 3]\u30E1" //KATAKANA LETTER ME
+		 "<<< \u30E1|\u30FD = \uFF92|\u30FD = \u3081|\u309D"
 
-        "&[before 3]\u30e4<<<\u30e4|\u30fd=\u3084|\u309d=\u30e3|\u30fd=\u3083|\u309d" // YA
+		"&[before 3]\u30E2" //KATAKANA LETTER MO
+		 "<<< \u30E2|\u30FD = \uFF93|\u30FD = \u3082|\u309D"
 
-        "&[before 3]\u30e6<<<\u30e6|\u30fd=\u3086|\u309d=\u30e5|\u30fd=\u3085|\u309d" // YU
+		"&[before 3]\u30E4" //KATAKANA LETTER YA
+		 "<<< \u30E4|\u30FD = \uFF94|\u30FD = \u3084|\u309D"
+		   "= \u30E3|\u30FD = \uFF6C|\u30FD = \u3083|\u309D"
 
-        "&[before 3]\u30e8<<<\u30e8|\u30fd=\u3088|\u309d=\u30e7|\u30fd=\u3087|\u309d" // YO
+		"&[before 3]\u30E6" //KATAKANA LETTER YU
+		 "<<< \u30E6|\u30FD = \uFF95|\u30FD = \u3086|\u309D"
+		   "= \u30E5|\u30FD = \uFF6D|\u30FD = \u3085|\u309D"
 
-        "&[before 3]\u30e9<<<\u30e9|\u30fd=\u3089|\u309d" // RA
+		"&[before 3]\u30E8" //KATAKANA LETTER YO
+		 "<<< \u30E8|\u30FD = \uFF96|\u30FD = \u3088|\u309D"
+		   "= \u30E7|\u30FD = \uFF6E|\u30FD = \u3087|\u309D"
 
-        "&[before 3]\u30ea<<<\u30ea|\u30fd=\u308a|\u309d" // RI
+		"&[before 3]\u30E9" //KATAKANA LETTER RA
+		 "<<< \u30E9|\u30FD = \uFF97|\u30FD = \u3089|\u309D"
 
-        "&[before 3]\u30eb<<<\u30eb|\u30fd=\u308b|\u309d" // RU
+		"&[before 3]\u30EA" //KATAKANA LETTER RI
+		 "<<< \u30EA|\u30FD = \uFF98|\u30FD = \u308A|\u309D"
 
-        "&[before 3]\u30ec<<<\u30ec|\u30fd=\u308c|\u309d" // RE
+		"&[before 3]\u30EB" //KATAKANA LETTER RU
+		 "<<< \u30EB|\u30FD = \uFF99|\u30FD = \u308B|\u309D"
 
-        "&[before 3]\u30ed<<<\u30ed|\u30fd=\u308d|\u309d" // RO
+		"&[before 3]\u30EC" //KATAKANA LETTER RE
+		 "<<< \u30EC|\u30FD = \uFF9A|\u30FD = \u308C|\u309D"
 
+		"&[before 3]\u30ED" //KATAKANA LETTER RO
+		 "<<< \u30ED|\u30FD = \uFF9B|\u30FD = \u308D|\u309D"
 
-        "&[before 3]\u30ef<<<\u30ef|\u30fd=\u30ef\u3099|\u30fd=\u308f|\u309d" // WA
-        "=\u30ee|\u30fd=\u308e|\u309d" // SMALL WA
-        "=\u30ef|\u30fe/\u3099=\u30ef\u3099|\u30fe/\u3099" // VA
-        "=\u30ee|\u30fe/\u3099=\u308e|\u309e/\u3099" // SMALL WA FOLLOWED BY A VOICED ITERATION MARK
+		"&[before 3]\u30EF" //KATAKANA LETTER WA
+		 "<<< \u30EF|\u30FD = \uFF9C|\u30FD = \u308F|\u309D"
+		   "= \u30EE|\u30FD = \u308E|\u309D"
+		   "= \u30F7|\u30FD"
+		   "= \u30EF|\u30FE/\u3099 = \uFF9C|\u30FE/\u3099 = \u308F|\u309E/\u3099"
+		   "= \u30F7|\u30FE/\u3099"
+		   "= \u30EE|\u30FE/\u3099 = \u308E|\u309E/\u3099"
 
-        "&[before 3]\u30f0<<<\u30f0|\u30fd=\u30f0\u3099|\u30fd=\u3090|\u309d" // WI
-        "=\u30f0|\u30fe/\u3099=\u30f0\u3099|\u30fe/\u3099" // VI
+		"&[before 3]\u30F0" //KATAKANA LETTER WI
+		 "<<< \u30F0|\u30FD = \u3090|\u309D"
+		   "= \u30F8|\u30FD"
+		   "= \u30F0|\u30FE/\u3099 = \u3090|\u309E/\u3099"
+		   "= \u30F8|\u30FE/\u3099"
 
-        "&[before 3]\u30f1<<<\u30f1|\u30fd=\u30f1\u3099|\u30fd=\u3091|\u309d" // WE
-        "=\u30f1|\u30fe/\u3099=\u30f1\u3099|\u30fe/\u3099" // VE
+		"&[before 3]\u30F1" //KATAKANA LETTER WE
+		 "<<< \u30F1|\u30FD = \u3091|\u309D"
+		   "= \u30F9|\u30FD"
+		   "= \u30F1|\u30FE/\u3099 = \u3091|\u309E/\u3099"
+		   "= \u30F9|\u30FE/\u3099"
 
-        "&[before 3]\u30f2<<<\u30f2|\u30fd=\u30f2\u3099|\u30fd=\u3092|\u309d" // WO
-        "=\u30f2|\u30fe/\u3099=\u30f2\u3099|\u30fe/\u3099" // VO
+		"&[before 3]\u30F2" //KATAKANA LETTER WO
+		 "<<< \u30F2|\u30FD = \uFF66|\u30FD = \u3092|\u309D"
+		   "= \u30FA|\u30FD"
+		   "= \u30F2|\u30FE/\u3099 = \uFF66|\u30FE/\u3099 = \u3092|\u309E/\u3099"
+		   "= \u30FA|\u30FE/\u3099"
 
-        "&[before 3]\u30f3<<<\u30f3|\u30fd=\u3093|\u309d" // N
+		"&[before 3]\u30F3" //KATAKANA LETTER N
+		 "<<< \u30F3|\u30FD = \uFF9D|\u30FD = \u3093|\u309D"
 
-        // This one should probably go with U
-        "&[before 3]\u30a6<<<\u30a6\u3099|\u30fd=\u3046\u3099|\u309d"  // VU
-        "=\u30a6|\u30fe/\u3099=\u30a6\u3099|\u30fe/\u3099=\u3046|\u309e/\u3099=\u3046\u3099|\u309e/\u3099"
+		// Equaling Katakana, Hiragana and compatibility
+		"&\u30A1 = \u30A1 = \u3041 = \uFF67" // KATAKANA LETTER SMALL A
+		"&\u30A2 = \u30A2 = \u3042 = \uFF71" // KATAKANA LETTER A
+		"&\u30A3 = \u30A3 = \u3043 = \uFF68" // KATAKANA LETTER SMALL I
+		"&\u30A4 = \u30A4 = \u3044 = \uFF72" // KATAKANA LETTER I
+		"&\u30A5 = \u30A5 = \u3045 = \uFF69" // KATAKANA LETTER SMALL U
+		"&\u30A6 = \u30A6 = \u3046 = \uFF73" // KATAKANA LETTER U
+		"&\u30A7 = \u30A7 = \u3047 = \uFF6A" // KATAKANA LETTER SMALL E
+		"&\u30A8 = \u30A8 = \u3048 = \uFF74" // KATAKANA LETTER E
+		"&\u30A9 = \u30A9 = \u3049 = \uFF6B" // KATAKANA LETTER SMALL O
+		"&\u30AA = \u30AA = \u304A = \uFF75" // KATAKANA LETTER O
+		"&\u30AB = \u30AB = \u304B = \uFF76" // KATAKANA LETTER KA
+		"&\u30AD = \u30AD = \u304D = \uFF77" // KATAKANA LETTER KI
+		"&\u30AF = \u30AF = \u304F = \uFF78" // KATAKANA LETTER KU
+		"&\u30B1 = \u30B1 = \u3051 = \uFF79" // KATAKANA LETTER KE
+		"&\u30B3 = \u30B3 = \u3053 = \uFF7A" // KATAKANA LETTER KO
+		"&\u30B5 = \u30B5 = \u3055 = \uFF7B" // KATAKANA LETTER SA
+		"&\u30B7 = \u30B7 = \u3057 = \uFF7C" // KATAKANA LETTER SI
+		"&\u30B9 = \u30B9 = \u3059 = \uFF7D" // KATAKANA LETTER SU
+		"&\u30BB = \u30BB = \u305B = \uFF7E" // KATAKANA LETTER SE
+		"&\u30BD = \u30BD = \u305D = \uFF7F" // KATAKANA LETTER SO
+		"&\u30BF = \u30BF = \u305F = \uFF80" // KATAKANA LETTER TA
+		"&\u30C1 = \u30C1 = \u3061 = \uFF81" // KATAKANA LETTER TI
+		"&\u30C3 = \u30C3 = \u3063 = \uFF6F" // KATAKANA LETTER SMALL TU
+		"&\u30C4 = \u30C4 = \u3064 = \uFF82" // KATAKANA LETTER TU
+		"&\u30C6 = \u30C6 = \u3066 = \uFF83" // KATAKANA LETTER TE
+		"&\u30C8 = \u30C8 = \u3068 = \uFF84" // KATAKANA LETTER TO
+		"&\u30CA = \u30CA = \u306A = \uFF85" // KATAKANA LETTER NA
+		"&\u30CB = \u30CB = \u306B = \uFF86" // KATAKANA LETTER NI
+		"&\u30CC = \u30CC = \u306C = \uFF87" // KATAKANA LETTER NU
+		"&\u30CD = \u30CD = \u306D = \uFF88" // KATAKANA LETTER NE
+		"&\u30CE = \u30CE = \u306E = \uFF89" // KATAKANA LETTER NO
+		"&\u30CF = \u30CF = \u306F = \uFF8A" // KATAKANA LETTER HA
+		"&\u30D2 = \u30D2 = \u3072 = \uFF8B" // KATAKANA LETTER HI
+		"&\u30D5 = \u30D5 = \u3075 = \uFF8C" // KATAKANA LETTER HU
+		"&\u30D8 = \u30D8 = \u3078 = \uFF8D" // KATAKANA LETTER HE
+		"&\u30DB = \u30DB = \u307B = \uFF8E" // KATAKANA LETTER HO
+		"&\u30DE = \u30DE = \u307E = \uFF8F" // KATAKANA LETTER MA
+		"&\u30DF = \u30DF = \u307F = \uFF90" // KATAKANA LETTER MI
+		"&\u30E0 = \u30E0 = \u3080 = \uFF91" // KATAKANA LETTER MU
+		"&\u30E1 = \u30E1 = \u3081 = \uFF92" // KATAKANA LETTER ME
+		"&\u30E2 = \u30E2 = \u3082 = \uFF93" // KATAKANA LETTER MO
+		"&\u30E3 = \u30E3 = \u3083 = \uFF6C" // KATAKANA LETTER SMALL YA
+		"&\u30E4 = \u30E4 = \u3084 = \uFF94" // KATAKANA LETTER YA
+		"&\u30E5 = \u30E5 = \u3085 = \uFF6D" // KATAKANA LETTER SMALL YU
+		"&\u30E6 = \u30E6 = \u3086 = \uFF95" // KATAKANA LETTER YU
+		"&\u30E7 = \u30E7 = \u3087 = \uFF6E" // KATAKANA LETTER SMALL YO
+		"&\u30E8 = \u30E8 = \u3088 = \uFF96" // KATAKANA LETTER YO
+		"&\u30E9 = \u30E9 = \u3089 = \uFF97" // KATAKANA LETTER RA
+		"&\u30EA = \u30EA = \u308A = \uFF98" // KATAKANA LETTER RI
+		"&\u30EB = \u30EB = \u308B = \uFF99" // KATAKANA LETTER RU
+		"&\u30EC = \u30EC = \u308C = \uFF9A" // KATAKANA LETTER RE
+		"&\u30ED = \u30ED = \u308D = \uFF9B" // KATAKANA LETTER RO
+		"&\u30EE = \u30EE = \u308E" // KATAKANA LETTER SMALL WA
+		"&\u30EF = \u30EF = \u308F = \uFF9C" // KATAKANA LETTER WA
+		"&\u30F0 = \u30F0 = \u3090" // KATAKANA LETTER WI
+		"&\u30F1 = \u30F1 = \u3091" // KATAKANA LETTER WE
+		"&\u30F2 = \u30F2 = \u3092 = \uFF66" // KATAKANA LETTER WO
+		"&\u30F3 = \u30F3 = \u3093 = \uFF9D" // KATAKANA LETTER N
+		"&\u30F5 = \u30F5" // KATAKANA LETTER SMALL KA
+		"&\u30F6 = \u30F6" // KATAKANA LETTER SMALL KE
+
+		// Equaling normal and halfwidth/fullwidth characters
+		"&' '=\u3000" // IDEOGRAPHIC SPACE
+		"&'\u0020' = '\uFFE3'" // SPACE
+		"&'\u0021' = '\uFF01'" // EXCLAMATION MARK
+		"&'\u0022' = '\uFF02'" // QUOTATION MARK
+		"&'\u0023' = '\uFF03'" // NUMBER SIGN
+		"&'\u0024' = '\uFF04'" // DOLLAR SIGN
+		"&'\u0025' = '\uFF05'" // PERCENT SIGN
+		"&'\u0026' = '\uFF06'" // AMPERSAND
+		"&'' = '\uFF07'" // APOSTROPHE
+		"&'\u0028' = '\uFF08'" // LEFT PARENTHESIS
+		"&'\u0029' = '\uFF09'" // RIGHT PARENTHESIS
+		"&'\u002A' = '\uFF0A'" // ASTERISK
+		"&'\u002B' = '\uFF0B'" // PLUS SIGN
+		"&'\u002C' = '\uFF0C'" // COMMA
+		"&'\u002D' = '\uFF0D'" // HYPHEN-MINUS
+		"&'\u002E' = '\uFF0E'" // FULL STOP
+		"&'\u002F' = '\uFF0F'" // SOLIDUS
+		"&'\u0030' = '\uFF10'" // DIGIT ZERO
+		"&'\u0031' = '\uFF11'" // DIGIT ONE
+		"&'\u0032' = '\uFF12'" // DIGIT TWO
+		"&'\u0033' = '\uFF13'" // DIGIT THREE
+		"&'\u0034' = '\uFF14'" // DIGIT FOUR
+		"&'\u0035' = '\uFF15'" // DIGIT FIVE
+		"&'\u0036' = '\uFF16'" // DIGIT SIX
+		"&'\u0037' = '\uFF17'" // DIGIT SEVEN
+		"&'\u0038' = '\uFF18'" // DIGIT EIGHT
+		"&'\u0039' = '\uFF19'" // DIGIT NINE
+		"&'\u003A' = '\uFF1A'" // COLON
+		"&'\u003B' = '\uFF1B'" // SEMICOLON
+		"&'\u003C' = '\uFF1C'" // LESS-THAN SIGN
+		"&'\u003D' = '\uFF1D'" // EQUALS SIGN
+		"&'\u003E' = '\uFF1E'" // GREATER-THAN SIGN
+		"&'\u003F' = '\uFF1F'" // QUESTION MARK
+		"&'\u0040' = '\uFF20'" // COMMERCIAL AT
+		"&'\u0041' = '\uFF21'" // LATIN CAPITAL LETTER A
+		"&'\u0042' = '\uFF22'" // LATIN CAPITAL LETTER B
+		"&'\u0043' = '\uFF23'" // LATIN CAPITAL LETTER C
+		"&'\u0044' = '\uFF24'" // LATIN CAPITAL LETTER D
+		"&'\u0045' = '\uFF25'" // LATIN CAPITAL LETTER E
+		"&'\u0046' = '\uFF26'" // LATIN CAPITAL LETTER F
+		"&'\u0047' = '\uFF27'" // LATIN CAPITAL LETTER G
+		"&'\u0048' = '\uFF28'" // LATIN CAPITAL LETTER H
+		"&'\u0049' = '\uFF29'" // LATIN CAPITAL LETTER I
+		"&'\u004A' = '\uFF2A'" // LATIN CAPITAL LETTER J
+		"&'\u004B' = '\uFF2B'" // LATIN CAPITAL LETTER K
+		"&'\u004C' = '\uFF2C'" // LATIN CAPITAL LETTER L
+		"&'\u004D' = '\uFF2D'" // LATIN CAPITAL LETTER M
+		"&'\u004E' = '\uFF2E'" // LATIN CAPITAL LETTER N
+		"&'\u004F' = '\uFF2F'" // LATIN CAPITAL LETTER O
+		"&'\u0050' = '\uFF30'" // LATIN CAPITAL LETTER P
+		"&'\u0051' = '\uFF31'" // LATIN CAPITAL LETTER Q
+		"&'\u0052' = '\uFF32'" // LATIN CAPITAL LETTER R
+		"&'\u0053' = '\uFF33'" // LATIN CAPITAL LETTER S
+		"&'\u0054' = '\uFF34'" // LATIN CAPITAL LETTER T
+		"&'\u0055' = '\uFF35'" // LATIN CAPITAL LETTER U
+		"&'\u0056' = '\uFF36'" // LATIN CAPITAL LETTER V
+		"&'\u0057' = '\uFF37'" // LATIN CAPITAL LETTER W
+		"&'\u0058' = '\uFF38'" // LATIN CAPITAL LETTER X
+		"&'\u0059' = '\uFF39'" // LATIN CAPITAL LETTER Y
+		"&'\u005A' = '\uFF3A'" // LATIN CAPITAL LETTER Z
+		"&'\u005B' = '\uFF3B'" // LEFT SQUARE BRACKET
+		"&'\u005C' = '\uFF3C'" // REVERSE SOLIDUS
+		"&'\u005D' = '\uFF3D'" // RIGHT SQUARE BRACKET
+		"&'\u005E' = '\uFF3E'" // CIRCUMFLEX ACCENT
+		"&'\u005F' = '\uFF3F'" // LOW LINE
+		"&'\u0060' = '\uFF40'" // GRAVE ACCENT
+		"&'\u0061' = '\uFF41'" // LATIN SMALL LETTER A
+		"&'\u0062' = '\uFF42'" // LATIN SMALL LETTER B
+		"&'\u0063' = '\uFF43'" // LATIN SMALL LETTER C
+		"&'\u0064' = '\uFF44'" // LATIN SMALL LETTER D
+		"&'\u0065' = '\uFF45'" // LATIN SMALL LETTER E
+		"&'\u0066' = '\uFF46'" // LATIN SMALL LETTER F
+		"&'\u0067' = '\uFF47'" // LATIN SMALL LETTER G
+		"&'\u0068' = '\uFF48'" // LATIN SMALL LETTER H
+		"&'\u0069' = '\uFF49'" // LATIN SMALL LETTER I
+		"&'\u006A' = '\uFF4A'" // LATIN SMALL LETTER J
+		"&'\u006B' = '\uFF4B'" // LATIN SMALL LETTER K
+		"&'\u006C' = '\uFF4C'" // LATIN SMALL LETTER L
+		"&'\u006D' = '\uFF4D'" // LATIN SMALL LETTER M
+		"&'\u006E' = '\uFF4E'" // LATIN SMALL LETTER N
+		"&'\u006F' = '\uFF4F'" // LATIN SMALL LETTER O
+		"&'\u0070' = '\uFF50'" // LATIN SMALL LETTER P
+		"&'\u0071' = '\uFF51'" // LATIN SMALL LETTER Q
+		"&'\u0072' = '\uFF52'" // LATIN SMALL LETTER R
+		"&'\u0073' = '\uFF53'" // LATIN SMALL LETTER S
+		"&'\u0074' = '\uFF54'" // LATIN SMALL LETTER T
+		"&'\u0075' = '\uFF55'" // LATIN SMALL LETTER U
+		"&'\u0076' = '\uFF56'" // LATIN SMALL LETTER V
+		"&'\u0077' = '\uFF57'" // LATIN SMALL LETTER W
+		"&'\u0078' = '\uFF58'" // LATIN SMALL LETTER X
+		"&'\u0079' = '\uFF59'" // LATIN SMALL LETTER Y
+		"&'\u007A' = '\uFF5A'" // LATIN SMALL LETTER Z
+		"&'\u007B' = '\uFF5B'" // LEFT CURLY BRACKET
+		"&'\u007C' = '\uFF5C'" // VERTICAL LINE
+		"&'\u007D' = '\uFF5D'" // RIGHT CURLY BRACKET
+		"&'\u007E' = '\uFF5E'" // TILDE
+		"&'\u00A2' = '\uFFE0'" // CENT SIGN
+		"&'\u00A3' = '\uFFE1'" // POUND SIGN
+		"&'\u00A5' = '\uFFE5'" // YEN SIGN
+		"&'\u00A6' = '\uFFE4'" // BROKEN BAR
+		"&'\u00AC' = '\uFFE2'" // NOT SIGN
+		"&'\u1100' = '\uFFA1'" // HANGUL CHOSEONG KIYEOK
+		"&'\u1101' = '\uFFA2'" // HANGUL CHOSEONG SSANGKIYEOK
+		"&'\u1102' = '\uFFA4'" // HANGUL CHOSEONG NIEUN
+		"&'\u1103' = '\uFFA7'" // HANGUL CHOSEONG TIKEUT
+		"&'\u1104' = '\uFFA8'" // HANGUL CHOSEONG SSANGTIKEUT
+		"&'\u1105' = '\uFFA9'" // HANGUL CHOSEONG RIEUL
+		"&'\u1106' = '\uFFB1'" // HANGUL CHOSEONG MIEUM
+		"&'\u1107' = '\uFFB2'" // HANGUL CHOSEONG PIEUP
+		"&'\u1108' = '\uFFB3'" // HANGUL CHOSEONG SSANGPIEUP
+		"&'\u1109' = '\uFFB5'" // HANGUL CHOSEONG SIOS
+		"&'\u110A' = '\uFFB6'" // HANGUL CHOSEONG SSANGSIOS
+		"&'\u110B' = '\uFFB7'" // HANGUL CHOSEONG IEUNG
+		"&'\u110C' = '\uFFB8'" // HANGUL CHOSEONG CIEUC
+		"&'\u110D' = '\uFFB9'" // HANGUL CHOSEONG SSANGCIEUC
+		"&'\u110E' = '\uFFBA'" // HANGUL CHOSEONG CHIEUCH
+		"&'\u110F' = '\uFFBB'" // HANGUL CHOSEONG KHIEUKH
+		"&'\u1110' = '\uFFBC'" // HANGUL CHOSEONG THIEUTH
+		"&'\u1111' = '\uFFBD'" // HANGUL CHOSEONG PHIEUPH
+		"&'\u1112' = '\uFFBE'" // HANGUL CHOSEONG HIEUH
+		"&'\u111A' = '\uFFB0'" // HANGUL CHOSEONG RIEUL-HIEUH
+		"&'\u1121' = '\uFFB4'" // HANGUL CHOSEONG PIEUP-SIOS
+		"&'\u1160' = '\uFFA0'" // HANGUL JUNGSEONG FILLER
+		"&'\u1161' = '\uFFC2'" // HANGUL JUNGSEONG A
+		"&'\u1162' = '\uFFC3'" // HANGUL JUNGSEONG AE
+		"&'\u1163' = '\uFFC4'" // HANGUL JUNGSEONG YA
+		"&'\u1164' = '\uFFC5'" // HANGUL JUNGSEONG YAE
+		"&'\u1165' = '\uFFC6'" // HANGUL JUNGSEONG EO
+		"&'\u1166' = '\uFFC7'" // HANGUL JUNGSEONG E
+		"&'\u1167' = '\uFFCA'" // HANGUL JUNGSEONG YEO
+		"&'\u1168' = '\uFFCB'" // HANGUL JUNGSEONG YE
+		"&'\u1169' = '\uFFCC'" // HANGUL JUNGSEONG O
+		"&'\u116A' = '\uFFCD'" // HANGUL JUNGSEONG WA
+		"&'\u116B' = '\uFFCE'" // HANGUL JUNGSEONG WAE
+		"&'\u116C' = '\uFFCF'" // HANGUL JUNGSEONG OE
+		"&'\u116D' = '\uFFD2'" // HANGUL JUNGSEONG YO
+		"&'\u116E' = '\uFFD3'" // HANGUL JUNGSEONG U
+		"&'\u116F' = '\uFFD4'" // HANGUL JUNGSEONG WEO
+		"&'\u1170' = '\uFFD5'" // HANGUL JUNGSEONG WE
+		"&'\u1171' = '\uFFD6'" // HANGUL JUNGSEONG WI
+		"&'\u1172' = '\uFFD7'" // HANGUL JUNGSEONG YU
+		"&'\u1173' = '\uFFDA'" // HANGUL JUNGSEONG EU
+		"&'\u1174' = '\uFFDB'" // HANGUL JUNGSEONG YI
+		"&'\u1175' = '\uFFDC'" // HANGUL JUNGSEONG I
+		"&'\u11AA' = '\uFFA3'" // HANGUL JONGSEONG KIYEOK-SIOS
+		"&'\u11AC' = '\uFFA5'" // HANGUL JONGSEONG NIEUN-CIEUC
+		"&'\u11AD' = '\uFFA6'" // HANGUL JONGSEONG NIEUN-HIEUH
+		"&'\u11B0' = '\uFFAA'" // HANGUL JONGSEONG RIEUL-KIYEOK
+		"&'\u11B1' = '\uFFAB'" // HANGUL JONGSEONG RIEUL-MIEUM
+		"&'\u11B2' = '\uFFAC'" // HANGUL JONGSEONG RIEUL-PIEUP
+		"&'\u11B3' = '\uFFAD'" // HANGUL JONGSEONG RIEUL-SIOS
+		"&'\u11B4' = '\uFFAE'" // HANGUL JONGSEONG RIEUL-THIEUTH
+		"&'\u11B5' = '\uFFAF'" // HANGUL JONGSEONG RIEUL-PHIEUPH
+		"&'\u20A9' = '\uFFE6'" // WON SIGN
+		"&'\u2190' = '\uFFE9'" // LEFTWARDS ARROW
+		"&'\u2191' = '\uFFEA'" // UPWARDS ARROW
+		"&'\u2192' = '\uFFEB'" // RIGHTWARDS ARROW
+		"&'\u2193' = '\uFFEC'" // DOWNWARDS ARROW
+		"&'\u2502' = '\uFFE8'" // BOX DRAWINGS LIGHT VERTICAL
+		"&'\u25A0' = '\uFFED'" // BLACK SQUARE
+		"&'\u25CB' = '\uFFEE'" // WHITE CIRCLE
+		"&'\u3001' = '\uFF64'" // IDEOGRAPHIC COMMA
+		"&'\u3002' = '\uFF61'" // IDEOGRAPHIC FULL STOP
+		"&'\u300C' = '\uFF62'" // LEFT CORNER BRACKET
+		"&'\u300D' = '\uFF63'" // RIGHT CORNER BRACKET
 
         // Kanji, positioned over the top
         "& [top] "
@@ -949,218 +1298,6 @@ ja_JP_JIS {
         "<\u9f5f<\u9f60<\u9f61<\u9f66<\u9f67<\u9f6c<\u9f6a<\u9f77<\u9f72"
         "<\u9f76<\u9f95<\u9f9c<\u9fa0<\u582f<\u69c7<\u9059<\u7464<\u51dc"
         "<\u7199"
-
-        // Fullwidth compatibility characters
-        "&' '=\u3000" // IDEOGRAPHIC SPACE
-        "&'!'=\uff01" // FULLWIDTH EXCLAMATION MARK
-        "&'\u0022'=\uff02" // FULLWIDTH QUOTATION MARK
-        "&'#'=\uff03" // FULLWIDTH NUMBER SIGN
-        "&'$'=\uff04" // FULLWIDTH DOLLAR SIGN
-        "&'%'=\uff05" // FULLWIDTH PERCENT SIGN
-        "&'&'=\uff06" // FULLWIDTH AMPERSAND
-        "&''=\uff07" // FULLWIDTH APOSTROPHE
-        "&'('=\uff08" // FULLWIDTH LEFT PARENTHESIS
-        "&')'=\uff09" // FULLWIDTH RIGHT PARENTHESIS
-        "&'*'=\uff0a" // FULLWIDTH ASTERISK
-        "&'+'=\uff0b" // FULLWIDTH PLUS SIGN
-        "&','=\uff0c" // FULLWIDTH COMMA
-        "&'-'=\uff0d" // FULLWIDTH HYPHEN-MINUS
-        "&'.'=\uff0e" // FULLWIDTH FULL STOP
-        "&'/'=\uff0f" // FULLWIDTH SOLIDUS
-        "&'0'=\uff10" // FULLWIDTH DIGIT ZERO
-        "&'1'=\uff11" // FULLWIDTH DIGIT ONE
-        "&'2'=\uff12" // FULLWIDTH DIGIT TWO
-        "&'3'=\uff13" // FULLWIDTH DIGIT THREE
-        "&'4'=\uff14" // FULLWIDTH DIGIT FOUR
-        "&'5'=\uff15" // FULLWIDTH DIGIT FIVE
-        "&'6'=\uff16" // FULLWIDTH DIGIT SIX
-        "&'7'=\uff17" // FULLWIDTH DIGIT SEVEN
-        "&'8'=\uff18" // FULLWIDTH DIGIT EIGHT
-        "&'9'=\uff19" // FULLWIDTH DIGIT NINE
-        "&':'=\uff1a" // FULLWIDTH COLON
-        "&';'=\uff1b" // FULLWIDTH SEMICOLON
-        "&'<'=\uff1c" // FULLWIDTH LESS-THAN SIGN
-        "&'='=\uff1d" // FULLWIDTH EQUALS SIGN
-        "&'>'=\uff1e" // FULLWIDTH GREATER-THAN SIGN
-        "&'?'=\uff1f" // FULLWIDTH QUESTION MARK
-        "&'@'=\uff20" // FULLWIDTH COMMERCIAL AT
-        "&'A'=\uff21" // FULLWIDTH LATIN CAPITAL LETTER A
-        "&'B'=\uff22" // FULLWIDTH LATIN CAPITAL LETTER B
-        "&'C'=\uff23" // FULLWIDTH LATIN CAPITAL LETTER C
-        "&'D'=\uff24" // FULLWIDTH LATIN CAPITAL LETTER D
-        "&'E'=\uff25" // FULLWIDTH LATIN CAPITAL LETTER E
-        "&'F'=\uff26" // FULLWIDTH LATIN CAPITAL LETTER F
-        "&'G'=\uff27" // FULLWIDTH LATIN CAPITAL LETTER G
-        "&'H'=\uff28" // FULLWIDTH LATIN CAPITAL LETTER H
-        "&'I'=\uff29" // FULLWIDTH LATIN CAPITAL LETTER I
-        "&'J'=\uff2a" // FULLWIDTH LATIN CAPITAL LETTER J
-        "&'K'=\uff2b" // FULLWIDTH LATIN CAPITAL LETTER K
-        "&'L'=\uff2c" // FULLWIDTH LATIN CAPITAL LETTER L
-        "&'M'=\uff2d" // FULLWIDTH LATIN CAPITAL LETTER M
-        "&'N'=\uff2e" // FULLWIDTH LATIN CAPITAL LETTER N
-        "&'O'=\uff2f" // FULLWIDTH LATIN CAPITAL LETTER O
-        "&'P'=\uff30" // FULLWIDTH LATIN CAPITAL LETTER P
-        "&'Q'=\uff31" // FULLWIDTH LATIN CAPITAL LETTER Q
-        "&'R'=\uff32" // FULLWIDTH LATIN CAPITAL LETTER R
-        "&'S'=\uff33" // FULLWIDTH LATIN CAPITAL LETTER S
-        "&'T'=\uff34" // FULLWIDTH LATIN CAPITAL LETTER T
-        "&'U'=\uff35" // FULLWIDTH LATIN CAPITAL LETTER U
-        "&'V'=\uff36" // FULLWIDTH LATIN CAPITAL LETTER V
-        "&'W'=\uff37" // FULLWIDTH LATIN CAPITAL LETTER W
-        "&'X'=\uff38" // FULLWIDTH LATIN CAPITAL LETTER X
-        "&'Y'=\uff39" // FULLWIDTH LATIN CAPITAL LETTER Y
-        "&'Z'=\uff3a" // FULLWIDTH LATIN CAPITAL LETTER Z
-        "&'['=\uff3b" // FULLWIDTH LEFT SQUARE BRACKET
-        "&'\u005c'=\uff3c" // FULLWIDTH REVERSE SOLIDUS
-        "&']'=\uff3d" // FULLWIDTH RIGHT SQUARE BRACKET
-        "&'^'=\uff3e" // FULLWIDTH CIRCUMFLEX ACCENT
-        "&'_'=\uff3f" // FULLWIDTH LOW LINE
-        "&'`'=\uff40" // FULLWIDTH GRAVE ACCENT
-        "&'a'=\uff41" // FULLWIDTH LATIN SMALL LETTER A
-        "&'b'=\uff42" // FULLWIDTH LATIN SMALL LETTER B
-        "&'c'=\uff43" // FULLWIDTH LATIN SMALL LETTER C
-        "&'d'=\uff44" // FULLWIDTH LATIN SMALL LETTER D
-        "&'e'=\uff45" // FULLWIDTH LATIN SMALL LETTER E
-        "&'f'=\uff46" // FULLWIDTH LATIN SMALL LETTER F
-        "&'g'=\uff47" // FULLWIDTH LATIN SMALL LETTER G
-        "&'h'=\uff48" // FULLWIDTH LATIN SMALL LETTER H
-        "&'i'=\uff49" // FULLWIDTH LATIN SMALL LETTER I
-        "&'j'=\uff4a" // FULLWIDTH LATIN SMALL LETTER J
-        "&'k'=\uff4b" // FULLWIDTH LATIN SMALL LETTER K
-        "&'l'=\uff4c" // FULLWIDTH LATIN SMALL LETTER L
-        "&'m'=\uff4d" // FULLWIDTH LATIN SMALL LETTER M
-        "&'n'=\uff4e" // FULLWIDTH LATIN SMALL LETTER N
-        "&'o'=\uff4f" // FULLWIDTH LATIN SMALL LETTER O
-        "&'p'=\uff50" // FULLWIDTH LATIN SMALL LETTER P
-        "&'q'=\uff51" // FULLWIDTH LATIN SMALL LETTER Q
-        "&'r'=\uff52" // FULLWIDTH LATIN SMALL LETTER R
-        "&'s'=\uff53" // FULLWIDTH LATIN SMALL LETTER S
-        "&'t'=\uff54" // FULLWIDTH LATIN SMALL LETTER T
-        "&'u'=\uff55" // FULLWIDTH LATIN SMALL LETTER U
-        "&'v'=\uff56" // FULLWIDTH LATIN SMALL LETTER V
-        "&'w'=\uff57" // FULLWIDTH LATIN SMALL LETTER W
-        "&'x'=\uff58" // FULLWIDTH LATIN SMALL LETTER X
-        "&'y'=\uff59" // FULLWIDTH LATIN SMALL LETTER Y
-        "&'z'=\uff5a" // FULLWIDTH LATIN SMALL LETTER Z
-        "&'{'=\uff5b" // FULLWIDTH LEFT CURLY BRACKET
-        "&'|'=\uff5c" // FULLWIDTH VERTICAL LINE
-        "&'}'=\uff5d" // FULLWIDTH RIGHT CURLY BRACKET
-        "&'~'=\uff5e" // FULLWIDTH TILDE
-
-        "&'\u3002'=\uff61" // HALFWIDTH IDEOGRAPHIC FULL STOP
-        "&'\u300c'=\uff62" // HALFWIDTH LEFT CORNER BRACKET
-        "&'\u300d'=\uff63" // HALFWIDTH RIGHT CORNER BRACKET
-        "&'\u3001'=\uff64" // HALFWIDTH IDEOGRAPHIC COMMA
-        "&'\u30fb'=\uff65" // HALFWIDTH KATAKANA MIDDLE DOT
-        "&'\u00a2'=\uffe0" // FULLWIDTH CENT SIGN
-        "&'\u00a3'=\uffe1" // FULLWIDTH POUND SIGN
-        "&'\u00ac'=\uffe2" // FULLWIDTH NOT SIGN
-        "&' \u0304'=\uffe3" // FULLWIDTH MACRON
-        "&'\u00a6'=\uffe4" // FULLWIDTH BROKEN BAR
-        "&'\u00a5'=\uffe5" // FULLWIDTH YEN SIGN
-        "&'\u20a9'=\uffe6" // FULLWIDTH WON SIGN
-        "&'\u2502'=\uffe8" // HALFWIDTH FORMS LIGHT VERTICAL
-        "&'\u2190'=\uffe9" // HALFWIDTH LEFTWARDS ARROW
-        "&'\u2191'=\uffea" // HALFWIDTH UPWARDS ARROW
-        "&'\u2192'=\uffeb" // HALFWIDTH RIGHTWARDS ARROW
-        "&'\u2193'=\uffec" // HALFWIDTH DOWNWARDS ARROW
-        "&'\u25a0'=\uffed" // HALFWIDTH BLACK SQUARE
-        "&'\u25cb'=\uffee" // HALFWIDTH WHITE CIRCLE
-
-        // Make Hiragana, Katakana & compatibility forms equal on the first three levels
-        // The first column is used to pull Katakana out of UCA, so that we get it the first
-        // time we look for it.
-        "&\u30A1=\u30A1=\u3041=\uff67" // SMALL A
-        "&\u30A2=\u30A2=\u3042=\uff71" // A
-        "&\u30A3=\u30A3=\u3043=\uff68" // SMALL I
-        "&\u30A4=\u30A4=\u3044=\uff72" // I
-        "&\u30A5=\u30A5=\u3045=\uff69" // SMALL U
-        "&\u30A6=\u30A6=\u3046=\uff73" // U
-        "&\u30A7=\u30A7=\u3047=\uff6a" // SMALL E
-        "&\u30A8=\u30A8=\u3048=\uff74" // E
-        "&\u30A9=\u30A9=\u3049=\uff6b" // SMALL O
-        "&\u30AA=\u30AA=\u304A=\uff75" // O
-        "&\u30AB=\u30AB=\u304B=\uff76" // KA
-        "&\u30AD=\u30AD=\u304D=\uff77" // KI
-        "&\u30AF=\u30AF=\u304F=\uff78" // KU
-        "&\u30B1=\u30B1=\u3051=\uff79" // KE
-        "&\u30B3=\u30B3=\u3053=\uff7a" // KO
-        "&\u30B5=\u30B5=\u3055=\uff7b" // SA
-        "&\u30B7=\u30B7=\u3057=\uff7c" // SI
-        "&\u30B9=\u30B9=\u3059=\uff7d" // SU
-        "&\u30BB=\u30BB=\u305B=\uff7e" // SE
-        "&\u30BD=\u30BD=\u305D=\uff7f" // SO
-        "&\u30BF=\u30BF=\u305F=\uff80" // TA
-        "&\u30C1=\u30C1=\u3061=\uff81" // TI
-        "&\u30C3=\u30C3=\u3063=\uff6f" // SMALL TU
-        "&\u30C4=\u30C4=\u3064=\uff82" // TU
-        "&\u30C6=\u30C6=\u3066=\uff83" // TE
-        "&\u30C8=\u30C8=\u3068=\uff84" // TO
-        "&\u30CA=\u30CA=\u306A=\uff85" // NA
-        "&\u30CB=\u30CB=\u306B=\uff86" // NI
-        "&\u30CC=\u30CC=\u306C=\uff87" // NU
-        "&\u30CD=\u30CD=\u306D=\uff88" // NE
-        "&\u30CE=\u30CE=\u306E=\uff89" // NO
-        "&\u30CF=\u30CF=\u306F=\uff8a" // HA
-        "&\u30D2=\u30D2=\u3072=\uff8b" // HI
-        "&\u30D5=\u30D5=\u3075=\uff8c" // HU
-        "&\u30D8=\u30D8=\u3078=\uff8d" // HE
-        "&\u30DB=\u30DB=\u307B=\uff8e" // HO
-        "&\u30DE=\u30DE=\u307E=\uff8f" // MA
-        "&\u30DF=\u30DF=\u307F=\uff90" // MI
-        "&\u30E0=\u30E0=\u3080=\uff91" // MU
-        "&\u30E1=\u30E1=\u3081=\uff92" // ME
-        "&\u30E2=\u30E2=\u3082=\uff93" // MO
-        "&\u30E3=\u30E3=\u3083=\uff6c" // SMALL YA
-        "&\u30E4=\u30E4=\u3084=\uff94" // YA
-        "&\u30E5=\u30E5=\u3085=\uff6d" // SMALL YU
-        "&\u30E6=\u30E6=\u3086=\uff95" // YU
-        "&\u30E7=\u30E7=\u3087=\uff6e" // SMALL YO
-        "&\u30E8=\u30E8=\u3088=\uff96" // YO
-        "&\u30E9=\u30E9=\u3089=\uff97" // RA
-        "&\u30EA=\u30EA=\u308A=\uff98" // RI
-        "&\u30EB=\u30EB=\u308B=\uff99" // RU
-        "&\u30EC=\u30EC=\u308C=\uff9a" // RE
-        "&\u30ED=\u30ED=\u308D=\uff9b" // RO
-        "&\u30EE=\u30EE=\u308E"        // SMALL WA
-        "&\u30EF=\u30EF=\u308F=\uff9c" // WA
-        "&\u30F0=\u30F0=\u3090"        // WI
-        "&\u30F1=\u30F1=\u3091"        // WE
-        "&\u30F2=\u30F2=\u3092=\uff66" // WO
-        "&\u30F3=\u30F3=\u3093=\uff9d" // N
-        "&\u30F5=\u30F5"               // SMALL KA
-        "&\u30F6=\u30F6"               // SMALL KE
-
-		}
-	}
+   }
+ }
 }
-
-
-// Voiced and semivoiced syllables
-//		"&\u30A6\u3099=\u3046\u3099"
-//		"&\u30AB\u3099=\u304B\u3099"
-//		"&\u30AD\u3099=\u304D\u3099"
-//		"&\u30AF\u3099=\u304F\u3099"
-//		"&\u30B1\u3099=\u3051\u3099"
-//		"&\u30B3\u3099=\u3053\u3099"
-//		"&\u30B5\u3099=\u3055\u3099"
-//		"&\u30B7\u3099=\u3057\u3099"
-//		"&\u30B9\u3099=\u3059\u3099"
-//		"&\u30BB\u3099=\u305B\u3099"
-//		"&\u30BD\u3099=\u305D\u3099"
-//		"&\u30BF\u3099=\u305F\u3099"
-//		"&\u30C1\u3099=\u3061\u3099"
-//		"&\u30C4\u3099=\u3064\u3099"
-//		"&\u30C6\u3099=\u3066\u3099"
-//		"&\u30C8\u3099=\u3068\u3099"
-//		"&\u30CF\u3099=\u306F\u3099"
-//		"&\u30CF\u309A=\u306F\u309A"
-//		"&\u30D2\u3099=\u3072\u3099"
-//		"&\u30D2\u309A=\u3072\u309A"
-//		"&\u30D5\u3099=\u3075\u3099"
-//		"&\u30D5\u309A=\u3075\u309A"
-//		"&\u30D8\u3099=\u3078\u3099"
-//		"&\u30D8\u309A=\u3078\u309A"
-//		"&\u30DB\u3099=\u307B\u3099"
-//		"&\u30DB\u309A=\u307B\u309A"
-