interscript-maps 2.5.1 → 3.0.0

data/maps/icao-mul-Latn-Latn-2015.isc

@@ -0,0 +1,256 @@
+system "ICAO:mul-Latn:Latn:2015" {
+
+metadata {
+  authority_id icao
+  id 9303
+  language iso-639-2:mul
+  source_script Latn
+  destination_script Latn
+  name "ICAO Doc 9303 Machine Readable Travel Documents Part 3 -- Transliteration of Multinational Latin-based Characters"
+  url https://www.icao.int/publications/pages/publication.aspx?docnum=9303
+  creation_date 2015
+  description {    Part 3 defines specifications that are common to TD1, TD2 and TD3 size machine
+    readable travel documents (MRTDs) including those necessary for global
+    interoperability using visual inspection and machine readable (optical character
+    recognition) means. Section A of the document's transliteration scheme renders
+    the multinational Latin-based characters; this map carries that folding for
+    Latin-script input. The document's per-language Cyrillic tables are separate
+    maps.
+  }
+
+  notes {
+    note "The source table gives some letters alternative renderings (a with diaeresis ae or a, a with ring aa or a, n with tilde n or nxx, o with diaeresis oe or o, u with diaeresis ue or u-variants); this map applies the primary expanded renderings (ae, aa, n, oe, ue) and documents the alternatives."
+    note "The letter thorn renders th and the sharp s renders ss; the dotless i renders i; the ligatures ae and oe render as their two-letter expansions and ij as ij."
+    note "Where a letter's uppercase and lowercase rows differ in the source (the sharp s appears in both), both renderings follow the source's letter values."
+  }
+}
+
+tests {
+   "À" ->  "A"
+   "à" ->  "a"
+   "Ä" ->  "AE"
+   "ä" ->  "ae"
+   "Å" ->  "AA"
+   "å" ->  "aa"
+   "Æ" ->  "AE"
+   "æ" ->  "ae"
+   "Ñ" ->  "N"
+   "ñ" ->  "n"
+   "Ø" ->  "OE"
+   "ø" ->  "oe"
+   "Ü" ->  "UE"
+   "ü" ->  "ue"
+   "Þ" ->  "TH"
+   "þ" ->  "th"
+   "ß" ->  "ss"
+   "Đ" ->  "D"
+   "đ" ->  "d"
+   "Ł" ->  "L"
+   "ł" ->  "l"
+   "Œ" ->  "OE"
+   "œ" ->  "oe"
+   "IJ" ->  "IJ"
+   "ij" ->  "ij"
+   "Š" ->  "S"
+   "š" ->  "s"
+   "Ž" ->  "Z"
+   "ž" ->  "z"
+}
+
+stage main {
+
+  # CHARACTERS
+  parallel {
+    sub "À" "A"
+    sub "Á" "A"
+    sub "Â" "A"
+    sub "Ã" "A"
+    sub "Ä" "AE"
+    sub "Å" "AA"
+    sub "Æ" "AE"
+    sub "Ç" "C"
+    sub "È" "E"
+    sub "É" "E"
+    sub "Ê" "E"
+    sub "Ë" "E"
+    sub "Ì" "I"
+    sub "Í" "I"
+    sub "Î" "I"
+    sub "Ï" "I"
+    sub "Ð" "D"
+    sub "Ñ" "N"
+    sub "Ò" "O"
+    sub "Ó" "O"
+    sub "Ô" "O"
+    sub "Õ" "O"
+    sub "Ö" "OE"
+    sub "Ø" "OE"
+    sub "Ù" "U"
+    sub "Ú" "U"
+    sub "Û" "U"
+    sub "Ü" "UE"
+    sub "Ý" "Y"
+    sub "Þ" "TH"
+    sub "ß" "ss"
+    sub "Ā" "A"
+    sub "Ă" "A"
+    sub "Ą" "A"
+    sub "Ć" "C"
+    sub "Ĉ" "C"
+    sub "Ċ" "C"
+    sub "Č" "C"
+    sub "Ď" "D"
+    sub "Đ" "D"
+    sub "Ē" "E"
+    sub "Ĕ" "E"
+    sub "Ė" "E"
+    sub "Ę" "E"
+    sub "Ě" "E"
+    sub "Ĝ" "G"
+    sub "Ğ" "G"
+    sub "Ġ" "G"
+    sub "Ģ" "G"
+    sub "Ĥ" "H"
+    sub "Ħ" "H"
+    sub "Ĩ" "I"
+    sub "Ī" "I"
+    sub "Ĭ" "I"
+    sub "Į" "I"
+    sub "İ" "I"
+    sub "IJ" "IJ"
+    sub "Ĵ" "J"
+    sub "Ķ" "K"
+    sub "Ĺ" "L"
+    sub "Ļ" "L"
+    sub "Ľ" "L"
+    sub "Ŀ" "L"
+    sub "Ł" "L"
+    sub "Ń" "N"
+    sub "Ņ" "N"
+    sub "Ň" "N"
+    sub "Ŋ" "N"
+    sub "Ō" "O"
+    sub "Ŏ" "O"
+    sub "Ő" "O"
+    sub "Œ" "OE"
+    sub "Ŕ" "R"
+    sub "Ŗ" "R"
+    sub "Ř" "R"
+    sub "Ś" "S"
+    sub "Ŝ" "S"
+    sub "Ş" "S"
+    sub "Š" "S"
+    sub "Ţ" "T"
+    sub "Ť" "T"
+    sub "Ŧ" "T"
+    sub "Ũ" "U"
+    sub "Ū" "U"
+    sub "Ŭ" "U"
+    sub "Ů" "U"
+    sub "Ű" "U"
+    sub "Ų" "U"
+    sub "Ŵ" "W"
+    sub "Ŷ" "Y"
+    sub "Ÿ" "Y"
+    sub "Ź" "Z"
+    sub "Ż" "Z"
+    sub "Ž" "Z"
+
+    sub "à" "a"
+    sub "á" "a"
+    sub "â" "a"
+    sub "ã" "a"
+    sub "ä" "ae"
+    sub "å" "aa"
+    sub "æ" "ae"
+    sub "ç" "c"
+    sub "è" "e"
+    sub "é" "e"
+    sub "ê" "e"
+    sub "ë" "e"
+    sub "ì" "i"
+    sub "í" "i"
+    sub "î" "i"
+    sub "ï" "i"
+    sub "ð" "d"
+    sub "ñ" "n"
+    sub "ò" "o"
+    sub "ó" "o"
+    sub "ô" "o"
+    sub "õ" "o"
+    sub "ö" "oe"
+    sub "ø" "oe"
+    sub "ù" "u"
+    sub "ú" "u"
+    sub "û" "u"
+    sub "ü" "ue"
+    sub "ý" "y"
+    sub "þ" "th"
+    sub "ÿ" "y"
+    sub "ā" "a"
+    sub "ă" "a"
+    sub "ą" "a"
+    sub "ć" "c"
+    sub "ĉ" "c"
+    sub "ċ" "c"
+    sub "č" "c"
+    sub "ď" "d"
+    sub "đ" "d"
+    sub "ē" "e"
+    sub "ĕ" "e"
+    sub "ė" "e"
+    sub "ę" "e"
+    sub "ě" "e"
+    sub "ĝ" "g"
+    sub "ğ" "g"
+    sub "ġ" "g"
+    sub "ģ" "g"
+    sub "ĥ" "h"
+    sub "ħ" "h"
+    sub "ĩ" "i"
+    sub "ī" "i"
+    sub "ĭ" "i"
+    sub "į" "i"
+    sub "ı" "i"
+    sub "ij" "ij"
+    sub "ĵ" "j"
+    sub "ķ" "k"
+    sub "ĺ" "l"
+    sub "ļ" "l"
+    sub "ľ" "l"
+    sub "ŀ" "l"
+    sub "ł" "l"
+    sub "ń" "n"
+    sub "ņ" "n"
+    sub "ň" "n"
+    sub "ŋ" "n"
+    sub "ō" "o"
+    sub "ŏ" "o"
+    sub "ő" "o"
+    sub "œ" "oe"
+    sub "ŕ" "r"
+    sub "ŗ" "r"
+    sub "ř" "r"
+    sub "ś" "s"
+    sub "ŝ" "s"
+    sub "ş" "s"
+    sub "š" "s"
+    sub "ţ" "t"
+    sub "ť" "t"
+    sub "ŧ" "t"
+    sub "ũ" "u"
+    sub "ū" "u"
+    sub "ŭ" "u"
+    sub "ů" "u"
+    sub "ű" "u"
+    sub "ų" "u"
+    sub "ŵ" "w"
+    sub "ŷ" "y"
+    sub "ź" "z"
+    sub "ż" "z"
+    sub "ž" "z"
+  }
+
+}
+
+}

data/maps/icao-rus-Cyrl-Latn-9303.isc

@@ -22,9 +22,27 @@ metadata {
     This document defines the transliteration mappings used to produce
     this transcription or transliteration.
   }
+
+  notes {
+    note "Diffed against ICAO Doc 9303 Part 3 Amd 1 (16/09/16), Section 6.B: the rows for І, Ќ, Ъ, Ѵ and Ғ were missing and were added with their source values. U+2019 right single quotation mark is now dropped alongside the ASCII apostrophe per Section 4.6 (apostrophes shall be omitted in the MRZ)."
+    note "The map carries a row for Ѓ (U+0403) to G, which has no row in the Amd 1 Section 6.B table (the table has Ғ, U+0492, to G); kept as a practical extension."
+    note "Soft sign Ь has no row in the Amd 1 Section 6.B table and is left unmapped."
+    note "The Amd 1 table prints row 04BA Һ (Cyrillic shha) as C; the map follows the source as printed, though C rather than H may be a source-side erratum."
+  }
 }
 
 tests {
+   "Ъ" ->  "IE"
+   "ъ" ->  "ie"
+   "Ѵ" ->  "Y"
+   "ѷ" ->  "y"
+   "Ғ" ->  "G"
+   "ғ" ->  "g"
+   "І" ->  "I"
+   "і" ->  "i"
+   "Ќ" ->  "K"
+   "ќ" ->  "k"
+   "Горбачёв" ->  "Gorbachev"
 }
 
 # https://www.icao.int/publications/Documents/9303_p3_cons_en.pdf
@@ -33,6 +51,7 @@ stage main {
   # CHARACTERS
   parallel {
     sub "'" ""
+    sub "’" ""
     sub "А" "A"
     sub "Б" "B"
     sub "Д" "D"
@@ -44,6 +63,7 @@ stage main {
     sub "И" "I"
     sub "Й" "I"
     sub "К" "K"
+    sub "Ќ" "K"
     sub "Л" "L"
     sub "М" "M"
     sub "Н" "N"
@@ -62,11 +82,14 @@ stage main {
     sub "Х" "KH"
     sub "Ш" "SH"
     sub "Щ" "SHCH"
+    sub "Ъ" "IE"
     sub "Ц" "TS"
     sub "Ж" "ZH"
     sub "Ґ" "G"
+    sub "Ғ" "G"
     sub "Ў" "U"
     sub "Ѫ" "U"
+    sub "Ѵ" "Y"
     sub "Ђ" "D"
     sub "Ѕ" "DZ"
     sub "Ј" "J"
@@ -76,6 +99,7 @@ stage main {
     sub "Џ" "DZ"
     sub "Є" "IE"
     sub "Ї" "I"
+    sub "І" "I"
     sub "Ѓ" "G"
 
     sub "а" "a"
@@ -89,6 +113,7 @@ stage main {
     sub "и" "i"
     sub "й" "i"
     sub "к" "k"
+    sub "ќ" "k"
     sub "л" "l"
     sub "м" "m"
     sub "н" "n"
@@ -107,11 +132,14 @@ stage main {
     sub "х" "kh"
     sub "ш" "sh"
     sub "щ" "shch"
+    sub "ъ" "ie"
     sub "ц" "ts"
     sub "ж" "zh"
     sub "ґ" "g"
+    sub "ғ" "g"
     sub "ў" "u"
     sub "ѫ" "u"
+    sub "ѷ" "y"
     sub "ђ" "d"
     sub "ѕ" "dz"
     sub "ј" "j"
@@ -121,6 +149,7 @@ stage main {
     sub "џ" "dz"
     sub "є" "ie"
     sub "ї" "i"
+    sub "і" "i"
     sub "ѓ" "g"
   }
 

data/maps/icao-srp-Cyrl-Latn-9303.isc

@@ -22,9 +22,47 @@ metadata {
     This document defines the transliteration mappings used to produce
     this transcription or transliteration.
   }
+
+  notes {
+    note "Diffed against ICAO Doc 9303 Part 3 Amd 1 (16/09/16), Section 6.B: the rows for І, Ќ, Ъ, Ѵ and Ғ were missing and were added with their source values. U+2019 right single quotation mark is now dropped alongside the ASCII apostrophe per Section 4.6 (apostrophes shall be omitted in the MRZ)."
+    note "Divergences corrected against the same source: the lowercase rows for у, ю, ў and ѫ were emptied or truncated (to nothing and to i); the source gives У to U, Ю to IU, Ў to U and Ѫ to U regardless of case, so the lowercase rows now mirror their uppercase rows."
+    note "Serbian exceptions applied per the source: Г renders H, Ж renders Z, Х renders H, Ц renders C, Ч renders C, Ш renders S. The letter Ћ (Serbian ce with acute), though common in Serbian, has no row in the Amd 1 Section 6.B table and is left unmapped; because Г renders H, the source's rendering of a name such as Београд is Beohrad."
+    note "The map carries a row for Ѓ (U+0403) to G, which has no row in the Amd 1 Section 6.B table (the table has Ғ, U+0492, to G); kept as a practical extension."
+    note "Soft sign Ь has no row in the Amd 1 Section 6.B table and is left unmapped."
+    note "The Amd 1 table prints row 04BA Һ (Cyrillic shha) as C; the map follows the source as printed, though C rather than H may be a source-side erratum."
+  }
 }
 
 tests {
+   "Г" ->  "H"
+   "г" ->  "h"
+   "Ж" ->  "Z"
+   "ж" ->  "z"
+   "Х" ->  "H"
+   "х" ->  "h"
+   "Ц" ->  "C"
+   "ц" ->  "c"
+   "Ч" ->  "C"
+   "ч" ->  "c"
+   "Ш" ->  "S"
+   "ш" ->  "s"
+   "Ђ" ->  "D"
+   "ђ" ->  "d"
+   "Љ" ->  "LJ"
+   "љ" ->  "lj"
+   "Њ" ->  "NJ"
+   "њ" ->  "nj"
+   "Ј" ->  "J"
+   "ј" ->  "j"
+   "у" ->  "u"
+   "ю" ->  "iu"
+   "Ъ" ->  "IE"
+   "ъ" ->  "ie"
+   "Ѵ" ->  "Y"
+   "ѷ" ->  "y"
+   "Ғ" ->  "G"
+   "ғ" ->  "g"
+   "Београд" ->  "Beohrad"
 }
 
 # https://www.icao.int/publications/Documents/9303_p3_cons_en.pdf
@@ -33,6 +71,7 @@ stage main {
   # CHARACTERS
   parallel {
     sub "'" ""
+    sub "’" ""
     sub "А" "A"
     sub "Б" "B"
     sub "Д" "D"
@@ -44,6 +83,7 @@ stage main {
     sub "И" "I"
     sub "Й" "I"
     sub "К" "K"
+    sub "Ќ" "K"
     sub "Л" "L"
     sub "М" "M"
     sub "Н" "N"
@@ -62,11 +102,14 @@ stage main {
     sub "Х" "H"
     sub "Ш" "S"
     sub "Щ" "SHCH"
+    sub "Ъ" "IE"
     sub "Ц" "C"
     sub "Ж" "Z"
     sub "Ґ" "G"
+    sub "Ғ" "G"
     sub "Ў" "U"
     sub "Ѫ" "U"
+    sub "Ѵ" "Y"
     sub "Ђ" "D"
     sub "Ѕ" "DZ"
     sub "Ј" "J"
@@ -76,6 +119,7 @@ stage main {
     sub "Џ" "DZ"
     sub "Є" "IE"
     sub "Ї" "I"
+    sub "І" "I"
     sub "Ѓ" "G"
 
     sub "а" "a"
@@ -89,6 +133,7 @@ stage main {
     sub "и" "i"
     sub "й" "i"
     sub "к" "k"
+    sub "ќ" "k"
     sub "л" "l"
     sub "м" "m"
     sub "н" "n"
@@ -97,21 +142,24 @@ stage main {
     sub "р" "r"
     sub "с" "s"
     sub "т" "t"
-    sub "у" ""
+    sub "у" "u"
     sub "в" "v"
     sub "ы" "y"
     sub "з" "z"
     sub "ч" "c"
     sub "я" "ia"
-    sub "ю" "i"
+    sub "ю" "iu"
     sub "х" "h"
     sub "ш" "s"
     sub "щ" "shch"
+    sub "ъ" "ie"
     sub "ц" "c"
     sub "ж" "z"
     sub "ґ" "g"
-    sub "ў" ""
-    sub "ѫ" ""
+    sub "ғ" "g"
+    sub "ў" "u"
+    sub "ѫ" "u"
+    sub "ѷ" "y"
     sub "ђ" "d"
     sub "ѕ" "dz"
     sub "ј" "j"
@@ -121,6 +169,7 @@ stage main {
     sub "џ" "dz"
     sub "є" "ie"
     sub "ї" "i"
+    sub "і" "i"
     sub "ѓ" "g"
   }
 

data/maps/icao-ukr-Cyrl-Latn-9303.isc

@@ -6,7 +6,7 @@ metadata {
   language iso-639-2:ukr
   source_script Cyrl
   destination_script Latn
-  name ICAO Doc 9303 Machine Readable Travel Documents Part 3 -- Ukranian Cyrillic to Latin
+  name ICAO Doc 9303 Machine Readable Travel Documents Part 3 -- Ukrainian Cyrillic to Latin
   url https://www.icao.int/publications/pages/publication.aspx?docnum=9303
   creation_date 2015
   description {    Part 3 defines specifications that are common to TD1, TD2 and TD3
@@ -22,9 +22,45 @@ metadata {
     This document defines the transliteration mappings used to produce
     this transcription or transliteration.
   }
+
+  notes {
+    note "Diffed against ICAO Doc 9303 Part 3 Amd 1 (16/09/16), Section 6.B: the rows for Ќ, Ъ, Ѵ and Ғ were missing and were added with their source values. U+2019 right single quotation mark is now dropped alongside the ASCII apostrophe per Section 4.6 (apostrophes shall be omitted in the MRZ). The system name previously misspelled Ukrainian as Ukranian."
+    note "Divergences corrected against the same source: Г was rendered G (and г g), but the source's row 0413 gives H for Ukrainian; И already rendered Y per row 0418. The lowercase rows for у, ю, ў and ѫ were emptied or truncated (to nothing and to i); the source gives У to U, Ю to IU, Ў to U and Ѫ to U regardless of case."
+    note "NOT ENCODED -- word-initial renderings. The source requires special renderings when the Ukrainian character is the first character of the name: Є renders YE, Ї renders YI, Й renders Y, Ю renders YU and Я renders YA. These positional rules are not expressible as plain parallel substitutions, and the current Ruby ISC runtime drops before/not_before constraints (Interscript::Isc::NodeAdapter reads constraint :value while the DocumentBuilder emits :item), so they would silently never fire. Once the runtime materializes constraints, encode them as sub rules placed before the parallel block, for both cases: sub { from \"Є\" to \"YE\" before boundary not_before boundary + \"’\" } and likewise for Ї/YI, Й/Y, Ю/YU, Я/YA (mirroring origin/icao-9303)."
+    note "The map carries a row for Ѓ (U+0403) to G, which has no row in the Amd 1 Section 6.B table (the table has Ғ, U+0492, to G); kept as a practical extension."
+    note "Soft sign Ь has no row in the Amd 1 Section 6.B table and is left unmapped."
+    note "The Amd 1 table prints row 04BA Һ (Cyrillic shha) as C; the map follows the source as printed, though C rather than H may be a source-side erratum."
+  }
 }
 
 tests {
+   "Г" ->  "H"
+   "г" ->  "h"
+   "И" ->  "Y"
+   "и" ->  "y"
+   "Й" ->  "I"
+   "й" ->  "i"
+   "Ї" ->  "I"
+   "ї" ->  "i"
+   "Є" ->  "IE"
+   "є" ->  "ie"
+   "Ґ" ->  "G"
+   "ґ" ->  "g"
+   "І" ->  "I"
+   "і" ->  "i"
+   "у" ->  "u"
+   "ю" ->  "iu"
+   "Ъ" ->  "IE"
+   "ъ" ->  "ie"
+   "Ѵ" ->  "Y"
+   "ѷ" ->  "y"
+   "Ғ" ->  "G"
+   "ғ" ->  "g"
+   "Ќ" ->  "K"
+   "ќ" ->  "k"
+   "Григоренко" ->  "Hryhorenko"
+   "Тарас Шевченко" ->  "Taras SHevchenko"
+   "’Ярослав" ->  "IAroslav"
 }
 
 # https://www.icao.int/publications/Documents/9303_p3_cons_en.pdf
@@ -33,6 +69,7 @@ stage main {
   # CHARACTERS
   parallel {
     sub "'" ""
+    sub "’" ""
     sub "А" "A"
     sub "Б" "B"
     sub "Д" "D"
@@ -40,10 +77,11 @@ stage main {
     sub "Е" "E"
     sub "Э" "E"
     sub "Ф" "F"
-    sub "Г" "G"
+    sub "Г" "H"
     sub "И" "Y"
     sub "Й" "I"
     sub "К" "K"
+    sub "Ќ" "K"
     sub "Л" "L"
     sub "М" "M"
     sub "Н" "N"
@@ -62,11 +100,14 @@ stage main {
     sub "Х" "KH"
     sub "Ш" "SH"
     sub "Щ" "SHCH"
+    sub "Ъ" "IE"
     sub "Ц" "TS"
     sub "Ж" "ZH"
     sub "Ґ" "G"
+    sub "Ғ" "G"
     sub "Ў" "U"
     sub "Ѫ" "U"
+    sub "Ѵ" "Y"
     sub "Ђ" "D"
     sub "Ѕ" "DZ"
     sub "Ј" "J"
@@ -86,10 +127,11 @@ stage main {
     sub "е" "e"
     sub "э" "e"
     sub "ф" "f"
-    sub "г" "g"
+    sub "г" "h"
     sub "и" "y"
     sub "й" "i"
     sub "к" "k"
+    sub "ќ" "k"
     sub "л" "l"
     sub "м" "m"
     sub "н" "n"
@@ -98,21 +140,24 @@ stage main {
     sub "р" "r"
     sub "с" "s"
     sub "т" "t"
-    sub "у" ""
+    sub "у" "u"
     sub "в" "v"
     sub "ы" "y"
     sub "з" "z"
     sub "ч" "ch"
     sub "я" "ia"
-    sub "ю" "i"
+    sub "ю" "iu"
     sub "х" "kh"
     sub "ш" "sh"
     sub "щ" "shch"
+    sub "ъ" "ie"
     sub "ц" "ts"
     sub "ж" "zh"
     sub "ґ" "g"
-    sub "ў" ""
-    sub "ѫ" ""
+    sub "ғ" "g"
+    sub "ў" "u"
+    sub "ѫ" "u"
+    sub "ѷ" "y"
     sub "ђ" "d"
     sub "ѕ" "dz"
     sub "ј" "j"
@@ -122,6 +167,7 @@ stage main {
     sub "џ" "dz"
     sub "є" "ie"
     sub "ї" "i"
+    sub "і" "i"
     sub "ѓ" "g"
   }
 

data/maps/iso-rus-Cyrl-Latn-9-1995.isc

@@ -18,6 +18,11 @@ metadata {
 }
 
 tests {
+  "Ӧ̄ ӧ̄" -> "Ọ̈ ọ̈"
+  "І̆ і̆" -> "Ĭ ĭ"
+  "Ј́ ј́" -> "J́ j́"
+  "У̊ у̊" -> "Ů ů"
+  "ъ ь ʼ ˮ Ӏ" -> "ʺ ʹ ʼ ˮ ‡"
 }
 
 stage main {
@@ -61,8 +66,9 @@ stage main {
     sub "І" "Ì"
     sub "Ї" "Ï"
     sub "І̄" "Ǐ"
+    sub "І̆" "Ĭ"
     sub "Ј" "J̌"
-    sub "Ј̵" "J́"
+    sub "Ј́" "J́"
     sub "К" "K"
     sub "Ќ" "Ḱ"
     sub "Ӄ" "Ḳ"
@@ -112,6 +118,7 @@ stage main {
     sub "Ў" "Ŭ"
     sub "Ӳ" "Ű"
     sub "У́" "Ú"
+    sub "У̊" "Ů"
     sub "Ӱ̄" "Ụ̈"
     sub "Ү" "Ù"
     sub "Ұ" "U̇"
@@ -185,8 +192,9 @@ stage main {
     sub "і" "ì"
     sub "ї" "ï"
     sub "і̄" "ǐ"
+    sub "і̆" "ĭ"
     sub "ј" "ǰ"
-    sub "ј̵" "j́"
+    sub "ј́" "j́"
     sub "к" "k"
     sub "ќ" "ḱ"
     sub "ӄ" "ḳ"
@@ -214,6 +222,7 @@ stage main {
     sub "ө" "ô"
     sub "ӫ" "ő"
     sub "о̄̈" "ọ̈"
+    sub "ӧ̄" "ọ̈"
     sub "ҩ" "ò"
     sub "о́" "ó"
     sub "о̄" "ō"
@@ -236,6 +245,7 @@ stage main {
     sub "ў" "ŭ"
     sub "ӳ" "ű"
     sub "у́" "ú"
+    sub "у̊" "ů"
     sub "ӱ̄" "ụ̈"
     sub "ү" "ù"
     sub "ұ" "u̇"
@@ -273,8 +283,8 @@ stage main {
     sub "ѳ" "f̀"
     sub "ѵ" "ỳ"
     sub "Ӏ" "‡"
-    sub "ʼ" "`"
-    sub "ˮ" "¨"
+    sub "ʼ" "ʼ"
+    sub "ˮ" "ˮ"
   }
 
 }