diff options
11 files changed, 33 insertions, 14 deletions
diff --git a/doc/context/third/transliterator/transliterator.tex b/doc/context/third/transliterator/transliterator.tex index 2f17dfa..62917b2 100644 --- a/doc/context/third/transliterator/transliterator.tex +++ b/doc/context/third/transliterator/transliterator.tex @@ -468,6 +468,7 @@ the scholarly transliterations. To amend the situation the Transliterator provides an extension to ISO~9 for Old Slavonic containing the glyphs \startluacode +local translit = thirddata.translit environment.loadluafile("trans_tables_scntfc") local cnt, len = 0, 0 for i,j in pairs(translit.ocs_add_low) do diff --git a/scripts/context/lua/mtx-transliterate.lua b/scripts/context/lua/mtx-transliterate.lua index 10e4ad8..17150f3 100644 --- a/scripts/context/lua/mtx-transliterate.lua +++ b/scripts/context/lua/mtx-transliterate.lua @@ -11,6 +11,8 @@ environment.loadluafile("transliterator") +local translit = thirddata.translit + translit.__script = true scripts = scripts or { } scripts.transliterate = { } diff --git a/tex/context/third/transliterator/t-transliterator.mkiv b/tex/context/third/transliterator/t-transliterator.mkiv index b6b841c..1f73c43 100644 --- a/tex/context/third/transliterator/t-transliterator.mkiv +++ b/tex/context/third/transliterator/t-transliterator.mkiv @@ -36,14 +36,14 @@ \def\set_serbian_exceptions{% \doifelse{\transliterateparameter{sr_exceptions}}\v!yes - {\ctxlua{translit.sr_except = true}} - {\ctxlua{translit.sr_except = false}}% + {\ctxlua{thirddata.translit.sr_except = true}} + {\ctxlua{thirddata.translit.sr_except = false}}% } \def\set_hinting{% \doifelse{\transliterateparameter{hinting}}\v!yes - {\ctxlua{translit.hinting = true}} - {\ctxlua{translit.hinting = false}}% + {\ctxlua{thirddata.translit.hinting = true}} + {\ctxlua{thirddata.translit.hinting = false}}% } \appendtoks \set_serbian_exceptions \to \everysetuptransliterate @@ -93,9 +93,9 @@ environment.loadluafile ("trans_tables_trsc") environment.loadluafile ("trans_tables_glag") environment.loadluafile ("trans_tables_gr") - translit.gen_rules_en() - translit.gen_rules_de() - translit.show_tab(translit["\luaescapestring{#1}"]) + thirddata.translit.gen_rules_en() + thirddata.translit.gen_rules_de() + thirddata.translit.show_tab(translit["\luaescapestring{#1}"]) \stopluacode } @@ -103,12 +103,12 @@ %D \type{\showTranslitTabs}. \define\showTranslitTabs{% - \ctxlua{translit.show_all_tabs()}% + \ctxlua{thirddata.translit.show_all_tabs()}% } \def\translitDebug#1{% \doif{\transliterateparameter{debug}}{yes}{% - {\ss\inmargin{\ctxlua{translit.debug_next()}} #1}% + {\ss\inmargin{\ctxlua{thirddata.translit.debug_next()}} #1}% }% } @@ -134,7 +134,7 @@ \setuptransliterate[#1]% \fi \language[\transliterateparameter{hyphenate}]% - \ctxlua{translit.transliterate("\transliterateparameter{mode}","\luaescapestring{#2}")}% + \ctxlua{thirddata.translit.transliterate("\transliterateparameter{mode}","\luaescapestring{#2}")}% \egroup% } @@ -152,7 +152,7 @@ \setuptransliterate[#1]% \fi \language[\transliterateparameter{hyphenate}]% - \ctxlua{translit.transliterate("\transliterateparameter{mode}","\luaescapestring{#2}")}% + \ctxlua{thirddata.translit.transliterate("\transliterateparameter{mode}","\luaescapestring{#2}")}% \egroup% } diff --git a/tex/context/third/transliterator/trans_tables_bg.lua b/tex/context/third/transliterator/trans_tables_bg.lua index ed1ddc2..97623f4 100644 --- a/tex/context/third/transliterator/trans_tables_bg.lua +++ b/tex/context/third/transliterator/trans_tables_bg.lua @@ -2,6 +2,8 @@ -- Bulgarian -- --===========================================================================-- +local translit = thirddata.translit + if not translit.done_bg then --------------------------------------------------------------------------- -- Uppercase Bulgarian -> „scientific“ transliteration -- diff --git a/tex/context/third/transliterator/trans_tables_glag.lua b/tex/context/third/transliterator/trans_tables_glag.lua index 0c6c0bf..41974fd 100644 --- a/tex/context/third/transliterator/trans_tables_glag.lua +++ b/tex/context/third/transliterator/trans_tables_glag.lua @@ -3,6 +3,8 @@ -- Glagolica -- --===========================================================================-- +local translit = thirddata.translit + ------------------------------------------- -- Lowercase Glagolitic Transliteration -- ------------------------------------------- diff --git a/tex/context/third/transliterator/trans_tables_gr.lua b/tex/context/third/transliterator/trans_tables_gr.lua index 31637b8..55b4c54 100644 --- a/tex/context/third/transliterator/trans_tables_gr.lua +++ b/tex/context/third/transliterator/trans_tables_gr.lua @@ -2,6 +2,7 @@ -- Greek -- --===========================================================================-- +local translit = thirddata.translit -- Note that the Greek transliteration mapping isn't bijective so transliterated -- texts won't be reversible. (Shouldn't be impossible to make one up using diff --git a/tex/context/third/transliterator/trans_tables_iso9.lua b/tex/context/third/transliterator/trans_tables_iso9.lua index 9007b20..5f7c6d8 100644 --- a/tex/context/third/transliterator/trans_tables_iso9.lua +++ b/tex/context/third/transliterator/trans_tables_iso9.lua @@ -2,6 +2,8 @@ -- ISO 9.1995(E) standardized transliteration for cyrillic -- --===========================================================================-- +local translit = thirddata.translit + if not translit.done_iso9 then ----------------------------------------- -- Lowercase russian cyrillic alphabet -- diff --git a/tex/context/third/transliterator/trans_tables_scntfc.lua b/tex/context/third/transliterator/trans_tables_scntfc.lua index 9de4b96..904db71 100644 --- a/tex/context/third/transliterator/trans_tables_scntfc.lua +++ b/tex/context/third/transliterator/trans_tables_scntfc.lua @@ -2,6 +2,7 @@ -- Other transliterations -- --===========================================================================-- +local translit = thirddata.translit -- The following are needed because ISO 9 does not cover old Slavonic -- characters that became obsolete before the advent of гражданский шрифт. diff --git a/tex/context/third/transliterator/trans_tables_sr.lua b/tex/context/third/transliterator/trans_tables_sr.lua index 3f18be5..e1fa1ff 100644 --- a/tex/context/third/transliterator/trans_tables_sr.lua +++ b/tex/context/third/transliterator/trans_tables_sr.lua @@ -3,6 +3,9 @@ -- Serbian -- --===========================================================================-- +local translit = thirddata.translit + + -- Special thanks to Mojca Miklavec and Arthur Reutenauer for their -- assistance in creating these transliteration routines. diff --git a/tex/context/third/transliterator/trans_tables_trsc.lua b/tex/context/third/transliterator/trans_tables_trsc.lua index 355f735..e80048a 100644 --- a/tex/context/third/transliterator/trans_tables_trsc.lua +++ b/tex/context/third/transliterator/trans_tables_trsc.lua @@ -1,6 +1,9 @@ --===========================================================================-- -- Legacy national transliterations -- --===========================================================================-- + +local translit = thirddata.translit + --------------------------------- -- German simple transcription -- --------------------------------- diff --git a/tex/context/third/transliterator/transliterator.lua b/tex/context/third/transliterator/transliterator.lua index ac3beb3..c046ffb 100644 --- a/tex/context/third/transliterator/transliterator.lua +++ b/tex/context/third/transliterator/transliterator.lua @@ -9,9 +9,11 @@ -------------------------------------------------------------------------------- -- -translit = translit or {} -translit.tables = translit.tables or {} -translit.methods = translit.methods or {} +thirddata = thirddata or { } +thirddata.translit = thirddata.translit or { } +local translit = thirddata.translit +translit.tables = translit.tables or { } +translit.methods = translit.methods or { } -------------------------------------------------------------------------------- -- Predefining vowel lists |