Can we call this ready?

2 files changed, 10 insertions, 4 deletions

diff --git a/tex/context/interface/third/t-transliterator.xml b/tex/context/interface/third/t-transliterator.xml
index 2ffb449..3320d7b 100644
--- a/tex/context/interface/third/t-transliterator.xml
+++ b/tex/context/interface/third/t-transliterator.xml
@@ -25,7 +25,7 @@
           <cd:constant type="gr_n"/>
         </cd:parameter>
         <cd:parameter name="hyphenate">
-          <cd:constant type="cz" default="yes"/>
+          <cd:constant type="cs" default="yes"/>
           <cd:constant type="sk"/>
         </cd:parameter>
       </cd:assignments>
diff --git a/tex/context/third/transliterator/t-transliterator.mkiv b/tex/context/third/transliterator/t-transliterator.mkiv
index 8f8cadf..aff2be5 100644
--- a/tex/context/third/transliterator/t-transliterator.mkiv
+++ b/tex/context/third/transliterator/t-transliterator.mkiv
@@ -866,6 +866,7 @@ translit.ocs_low = {
   ["р"] = "r",
   ["с"] = "s",
   ["т"] = "t",
+  ["у"] = "u",
   ["ѹ"] = "u",
   ["ꙋ"] = "u",
   ["ф"] = "f",
@@ -927,6 +928,7 @@ translit.ocs_upp = {
   ["Р"] = "R",
   ["С"] = "S",
   ["Т"] = "T",
+  ["У"] = "u",
   ["Ѹ"] = "U",
   ["ꙋ"] = "U",
   ["Ф"] = "F",
@@ -972,6 +974,7 @@ translit.ocs_add_low = {
   ["ѯ"] = "ks",
   ["ѱ"] = "ps",
   ["ѡ"] = "ô",
+  ["ѿ"] = "ot",     -- U+047f
   ["ѫ"] = "ǫ",          -- Mapped to ǎ in ISO 9.
   ["ѧ"] = "ę",
   ["ѭ"] = "jǫ",
@@ -993,6 +996,7 @@ translit.ocs_add_upp = {
   ["Ѯ"] = "Ks",
   ["Ѱ"] = "Ps",
   ["Ѡ"] = "Ô",
+  ["Ѿ"] = "ot",
   ["Ѫ"] = "Ǫ",
   ["Ѧ"] = "Ę",
   ["Ѭ"] = "Jǫ",
@@ -1939,6 +1943,8 @@ function translit.transliterate (method, text)
   elseif method == "iso9_ocs" then
     translit.add_table(repl_tab, translit.ru_upp)
     translit.add_table(repl_tab, translit.ru_low) 
+    translit.add_table(repl_tab, translit.ru_old_upp)
+    translit.add_table(repl_tab, translit.ru_old_low) 
     translit.add_table(repl_tab, translit.non_ru_upp)
     translit.add_table(repl_tab, translit.non_ru_low) 
     translit.add_table(repl_tab, translit.ocs_add_upp)
@@ -2055,15 +2061,15 @@ end
     \ifcsname TRLlocalmode\endcsname%
       %\translitDebug{{\type{\TRLlocalmode} expands to \TRLlocalmode. }}%
       \translitDebug{\type{\TRLlocalmode} is defined. }%
-      \ctxlua{translit.transliterate ("\TRLlocalmode", "#2")}%
+      \ctxlua{translit.transliterate ("\TRLlocalmode", "\luaescapestring{#2}")}%
     \else%
       \translitDebug{\type{\TRLlocalmode} is undefined.  Using global \type{\TRLmode}. }%
-      \ctxlua{translit.transliterate ("\TRLmode", "#2")}%
+      \ctxlua{translit.transliterate ("\TRLmode", "\luaescapestring{#2}")}%
     \fi%
   \else%
     \language[\TRLhyphenate]%
     \translitDebug{No translit options given.  Using defaults. }%
-    \ctxlua{translit.transliterate ("\TRLmode", "#2")}%
+    \ctxlua{translit.transliterate ("\TRLmode", "\luaescapestring{#2}")}%
   \fi%
 }