Fix japanese maps

Author: ronaldtse

maps/mext-jpn-Hrkt-Latn-hepburn.yaml

@@ -2,7 +2,7 @@
 authority_id: mext
 id: hepburn
 language: jpn
-source_script: Cyrl
+source_script: Hrkt
 destination_script: Latn
 name: Romanization of Japanese, Modified Hepburn System
 url: http://www.eki.ee/wgrs/rom2_ja.htm
@@ -21,8 +21,22 @@ notes:
   - The combination in parentheses is used to denote the word meaning ’big, great’.
 
 tests:
-  - source:
-    expected:
+  - source: おばあさん
+    expected: obāsan
+  - source: おにいさん
+    expected: oniisan
+  - source: みずうみ
+    expected: mizuumi
+  - source: とおまわり
+    expected: tōmawari
+  - source: べんきょう
+    expected: benkyō
+  - source: じゃあく
+    expected: jaaku
+  - source: バレーボール
+    expected: barēbōru
+  - source: スーパーマン
+    expected: sūpāman
 
 map:
   characters:
@@ -34,27 +48,33 @@ map:
     "か": "ka"
     "き": "ki"
     "く": "ku"
-    "け": "ke"
+    "け":
+      - "ke"
+      - "ga" # See note 4
     "こ": "ko"
     "さ": "sa"
-    "し": "si"
+    "し": "shi"
     "す": "su"
     "せ": "se"
     "そ": "so"
     "た": "ta"
-    "ち": "ti"
-    "つ": "tu1"
+    "ち": "chi"
+    "つ": "tsu" # See note 1
     "て": "te"
     "と": "to"
     "な": "na"
     "に": "ni"
     "ぬ": "nu"
     "ね": "ne"
     "の": "no"
-    "は": "ha"
+    "は":
+      - "ha"
+      - "wa" # See note 4
     "ひ": "hi"
-    "ふ": "hu"
-    "へ": "he"
+    "ふ": "fu"
+    "へ":
+      - "he"
+      - "e" # See note 4
     "ほ": "ho"
     "ま": "ma"
     "み": "mi"
@@ -74,13 +94,13 @@ map:
     "げ": "ge"
     "ご": "go"
     "ざ": "za"
-    "じ": "zi"
+    "じ": "ji"
     "ず": "zu"
     "ぜ": "ze"
     "ぞ": "zo"
     "だ": "da"
-    "ぢ": "di"
-    "づ": "du"
+    "ぢ": "ji"
+    "づ": "zu"
     "で": "de"
     "ど": "do"
     "ば": "ba"
@@ -93,76 +113,78 @@ map:
     "ぷ": "pu"
     "ぺ": "pe"
     "ぽ": "po"
-    "おぅ": "ô"
-    "おお": "ô" # See note 4
+    "おぅ": "ō"
+    "おお": "ō" # See note 4
     "きゃ": "kya"
     "きゅ": "kyu"
-    "きゅぅ": "kyû"
+    "きゅぅ": "kyū"
     "きょ": "kyo"
-    "きょぅ": "kyô"
-    "こぅ": "kô"
-    "しゃ": "sya"
-    "しゅ": "syu"
-    "しゅぅ": "syû"
-    "しょ": "syo"
-    "しょぅ": "syô"
-    "そぅ": "sô"
-    "ちゃ": "tya"
-    "ちゅ": "tyu"
-    "ちゅぅ": "tyû"
-    "ちょ": "tyo"
-    "ちょぅ": "tyô"
-    "とぅ": "tô"
+    "きょぅ": "kyō"
+    "こぅ": "kō"
+    "しゃ": "sha"
+    "しゅ": "shu"
+    "しゅぅ": "shū"
+    "しょ": "sho"
+    "しょぅ": "shō"
+    "そぅ": "sō"
+    "ちゃ": "cha"
+    "ちゅ": "chu"
+    "ちゅぅ": "chū"
+    "ちょ": "cho"
+    "ちょぅ": "chō"
+    "とぅ": "tō"
     "にゃ": "nya"
     "にゅ": "nyu"
-    "にゅぅ": "nyû"
+    "にゅぅ": "nyū"
     "にょ": "nyo"
-    "にょぅ": "nyô"
-    "のぅ": "nô"
+    "にょぅ": "nyō"
+    "のぅ": "nō"
     "ひゃ": "hya"
     "ひゅ": "hyu"
-    "ひゅぅ": "hyû"
+    "ひゅぅ": "hyū"
     "ひょ": "hyo"
-    "ひょぅ": "hyô"
-    "ほぅ": "hô"
+    "ひょぅ": "hyō"
+    "ほぅ":
+      - "hō"
+      - "ō" # See note 4
     "みゃ": "mya"
     "みゅ": "myu"
-    "みゅぅ": "myû"
+    "みゅぅ": "myū"
     "みょ": "myo"
-    "みょぅ": "myô"
-    "もぅ": "mô"
-    "よぅ": "yô"
+    "みょぅ": "myō"
+    "もぅ": "mō"
+    "よぅ": "yō"
     "りゃ": "rya"
     "りゅ": "ryu"
-    "りゅぅ": "ryû"
+    "りゅぅ": "ryū"
     "りょ": "ryo"
-    "りょぅ": "ryô"
-    "ろぅ": "rô"
+    "りょぅ": "ryō"
+    "ろぅ": "rō"
     "ぎゃ": "gya"
     "ぎゅ": "gyu"
-    "ぎゅぅ": "gyû"
+    "ぎゅぅ": "gyū"
     "ぎょ": "gyo"
-    "ぎょぅ": "gyô"
-    "ごぅ": "gô"
-    "じゃ": "zya"
-    "じゅ": "zyu"
-    "じゅぅ": "zyû"
-    "じょ": "zyo"
-    "じょぅ": "zyô"
-    "ぞぅ": "zô"
-    "どぅ": "dô"
+    "ぎょぅ": "gyō"
+    "ごぅ": "gō"
+    "じゃ": "ja"
+    "じゅ": "ju"
+    "じゅぅ": "jū"
+    "じょ": "jo"
+    "じょぅ": "jō"
+    "ぞぅ": "zō"
+    "どぅ": "dō"
     "びゃ": "bya"
     "びゅ": "byu"
-    "びゅぅ": "byû"
+    "びゅぅ": "byū"
     "びょ": "byo"
-    "びょぅ": "byô"
-    "ぼぅ": "bô"
+    "びょぅ": "byō"
+    "ぼぅ": "bō"
     "ぴゃ": "pya"
     "ぴゅ": "pyu"
-    "ぴゅぅ": "pyû"
+    "ぴゅぅ": "pyū"
     "ぴょ": "pyo"
-    "ぴょぅ": "pyô"
-    "ぽぅ": "pô"
+    "ぴょぅ": "pyō"
+    "ぽぅ": "pō"
     "ア": "a"
     "イ": "i"
     "ウ": "u"
@@ -174,24 +196,28 @@ map:
     "ケ": "ke"
     "コ": "ko"
     "サ": "sa"
-    "シ": "si"
+    "シ": "shi"
     "ス": "su"
     "セ": "se"
     "ソ": "so"
     "タ": "ta"
-    "チ": "ti"
-    "ツ": "tu1" # See note 1
+    "チ": "chi"
+    "ツ": "tsu" # See note 1
     "テ": "te"
     "ト": "to"
     "ナ": "na"
     "ニ": "ni"
     "ヌ": "nu"
     "ネ": "ne"
     "ノ": "no"
-    "ハ": "ha"
+    "ハ":
+      - "ha"
+      - "wa" # See note 4
     "ヒ": "hi"
-    "フ": "hu"
-    "ヘ": "he"
+    "フ": "fu"
+    "ヘ":
+      - "he"
+      - "e" # See note 4
     "ホ": "ho"
     "マ": "ma"
     "ミ": "mi"
@@ -211,13 +237,13 @@ map:
     "ゲ": "ge"
     "ゴ": "go"
     "ザ": "za"
-    "ジ": "zi"
+    "ジ": "ji"
     "ズ": "zu"
     "ゼ": "ze"
     "ゾ": "zo"
     "ダ": "da"
-    "ヂ": "di"
-    "ヅ": "du"
+    "ヂ": "ji"
+    "ヅ": "zu"
     "デ": "de"
     "ド": "do"
     "バ": "ba"
@@ -230,73 +256,75 @@ map:
     "プ": "pu"
     "ペ": "pe"
     "ポ": "po"
-    "オゥ": "ô"
-    "オオ": "ô" # See note 4
+    "オゥ": "ō"
+    "オオ": "ō" # See note 4
     "キャ": "kya"
     "キュ": "kyu"
-    "キュゥ": "kyû"
+    "キュゥ": "kyū"
     "キョ": "kyo"
-    "キョゥ": "kyô"
-    "コゥ": "kô"
-    "シャ": "sya"
-    "シュ": "syu"
-    "シュゥ": "syû"
-    "ショ": "syo"
-    "ショゥ": "syô"
-    "ソゥ": "sô"
-    "チャ": "tya"
-    "チュ": "tyu"
-    "チュゥ": "tyû"
-    "チョ": "tyo"
-    "チョゥ": "tyô"
-    "トゥ": "tô"
+    "キョゥ": "kyō"
+    "コゥ": "kō"
+    "シャ": "sha"
+    "シュ": "shu"
+    "シュゥ": "shū"
+    "ショ": "sho"
+    "ショゥ": "shō"
+    "ソゥ": "sō"
+    "チャ": "cha"
+    "チュ": "chu"
+    "チュゥ": "chū"
+    "チョ": "cho"
+    "チョゥ": "chō"
+    "トゥ": "tō"
     "ニャ": "nya"
     "ニュ": "nyu"
-    "ニュゥ": "nyû"
+    "ニュゥ": "nyū"
     "ニョ": "nyo"
-    "ニョゥ": "nyô"
-    "ノゥ": "nô"
+    "ニョゥ": "nyō"
+    "ノゥ": "nō"
     "ヒャ": "hya"
     "ヒュ": "hyu"
-    "ヒュゥ": "hyû"
+    "ヒュゥ": "hyū"
     "ヒョ": "hyo"
-    "ヒョゥ": "hyô"
-    "ホゥ": "hô"
+    "ヒョゥ": "hyō"
+    "ホゥ":
+      - "hō"
+      - "ō" # See note 4
     "ミャ": "mya"
     "ミュ": "myu"
-    "ミュゥ": "myû"
+    "ミュゥ": "myū"
     "ミョ": "myo"
-    "ミョゥ": "myô"
-    "モゥ": "mô"
-    "ヨゥ": "yô"
+    "ミョゥ": "myō"
+    "モゥ": "mō"
+    "ヨゥ": "yō"
     "リャ": "rya"
     "リュ": "ryu"
-    "リュゥ": "ryû"
+    "リュゥ": "ryū"
     "リョ": "ryo"
-    "リョゥ": "ryô"
-    "ロゥ": "rô"
+    "リョゥ": "ryō"
+    "ロゥ": "rō"
     "ギャ": "gya"
     "ギュ": "gyu"
-    "ギュゥ": "gyû"
+    "ギュゥ": "gyū"
     "ギョ": "gyo"
-    "ギョゥ": "gyô"
-    "ゴゥ": "gô"
-    "ジャ": "zya"
-    "ジュ": "zyu"
-    "ジュゥ": "zyû"
-    "ジョ": "zyo"
-    "ジョゥ": "zyô"
-    "ゾゥ": "zô"
-    "ドゥ": "dô"
+    "ギョゥ": "gyō"
+    "ゴゥ": "gō"
+    "ジャ": "ja"
+    "ジュ": "ju"
+    "ジュゥ": "jū"
+    "ジョ": "jo"
+    "ジョゥ": "jō"
+    "ゾゥ": "zō"
+    "ドゥ": "dō"
     "ビャ": "bya"
     "ビュ": "byu"
-    "ビュゥ": "byû"
+    "ビュゥ": "byū"
     "ビョ": "byo"
-    "ビョゥ": "byô"
-    "ボゥ": "bô"
+    "ビョゥ": "byō"
+    "ボゥ": "bō"
     "ピャ": "pya"
     "ピュ": "pyu"
-    "ピュゥ": "pyû"
+    "ピュゥ": "pyū"
     "ピョ": "pyo"
-    "ピョゥ": "pyô"
-    "ポゥ": "pô"
+    "ピョゥ": "pyō"
+    "ポゥ": "pō"