diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/luat-ini.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/luat-ini.mkiv | 99 |
1 files changed, 51 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/luat-ini.mkiv b/Master/texmf-dist/tex/context/base/mkiv/luat-ini.mkiv index d1d829be978..09014ad86cd 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/luat-ini.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/luat-ini.mkiv @@ -34,7 +34,7 @@ % the \type {\normalexpanded} around \type {\directlua}. Something to discuss % in the team. -\normalprotected\def\startlua % \stoplua +\protected\def\startlua % \stoplua {\begingroup \obeylualines \luat_start_lua_indeed} @@ -42,7 +42,7 @@ \def\luat_start_lua_indeed#1\stoplua {\normalexpanded{\endgroup\noexpand\directlua{#1}}} % \zerocount is default -\normalprotected\def\startluacode % \stopluacode +\protected\def\startluacode % \stopluacode {\begingroup \obeylualines \obeyluatokens @@ -77,24 +77,28 @@ \edef\lua_letter_seven {\string\7} \edef\lua_letter_eight {\string\8} \edef\lua_letter_nine {\string\9} \edef\lua_letter_zero {\string\0} +\pushoverloadmode + \let\-\explicitdiscretionary +\popoverloadmode + \everyluacode {% \appendtoks - \let\\\lua_letter_backslash - \let\|\lua_letter_bar \let\-\lua_letter_dash - \let\(\lua_letter_lparent \let\)\lua_letter_rparent - \let\{\lua_letter_lbrace \let\}\lua_letter_rbrace - \let\'\lua_letter_squote \let\"\lua_letter_dquote - \let\n\lua_letter_n \let\r\lua_letter_r - \let\f\lua_letter_f \let\t\lua_letter_t - \let\a\lua_letter_a \let\b\lua_letter_b - \let\v\lua_letter_v \let\s\lua_letter_s - \let\1\lua_letter_one \let\2\lua_letter_two - \let\3\lua_letter_three \let\4\lua_letter_four - \let\5\lua_letter_five \let\6\lua_letter_six - \let\7\lua_letter_seven \let\8\lua_letter_eight - \let\9\lua_letter_nine \let\0\lua_letter_zero + \enforced\let\\\lua_letter_backslash + \enforced\let\|\lua_letter_bar \enforced\let\-\lua_letter_dash + \enforced\let\(\lua_letter_lparent \enforced\let\)\lua_letter_rparent + \enforced\let\{\lua_letter_lbrace \enforced\let\}\lua_letter_rbrace + \enforced\let\'\lua_letter_squote \enforced\let\"\lua_letter_dquote + \enforced\let\n\lua_letter_n \enforced\let\r\lua_letter_r + \enforced\let\f\lua_letter_f \enforced\let\t\lua_letter_t + \enforced\let\a\lua_letter_a \enforced\let\b\lua_letter_b + \enforced\let\v\lua_letter_v \enforced\let\s\lua_letter_s + \enforced\let\1\lua_letter_one \enforced\let\2\lua_letter_two + \enforced\let\3\lua_letter_three \enforced\let\4\lua_letter_four + \enforced\let\5\lua_letter_five \enforced\let\6\lua_letter_six + \enforced\let\7\lua_letter_seven \enforced\let\8\lua_letter_eight + \enforced\let\9\lua_letter_nine \enforced\let\0\lua_letter_zero } % \to \everyluacode -\normalprotected\def\obeyluatokens +\protected\def\obeyluatokens {\setcatcodetable\luacatcodes \the\everyluacode} @@ -121,13 +125,12 @@ %D \edef\luaescapestring#1{\!!bs#1\!!es} %D \stoptyping -\def\setdocumentfilename #1#2{\clf_setdocumentfilename\numexpr#1\relax{#2}} -\def\setdocumentargument #1#2{\clf_setdocumentargument{#1}{#2}} -\def\setdocumentargumentdefault#1#2{\clf_setdocumentdefaultargument{#1}{#2}} -\def\getdocumentfilename #1{\clf_getdocumentfilename\numexpr#1\relax} -\def\getdocumentargument #1{\clf_getdocumentargument{#1}{}} -\def\setdocumentargument #1#2{\clf_setdocumentargument{#1}{#2}} -\def\getdocumentargumentdefault#1#2{\clf_getdocumentargument{#1}{#2}} +\protected\def\setdocumentfilename #1#2{\clf_setdocumentfilename\numexpr#1\relax{#2}} +\protected\def\setdocumentargument #1#2{\clf_setdocumentargument{#1}{#2}} +\protected\def\setdocumentargumentdefault#1#2{\clf_setdocumentdefaultargument{#1}{#2}} + \def\getdocumentfilename #1{\clf_getdocumentfilename\numexpr#1\relax} + \def\getdocumentargument #1{\clf_getdocumentargument{#1}{}} + \def\getdocumentargumentdefault#1#2{\clf_getdocumentargument{#1}{#2}} % seldom used so no need for speedy variants: @@ -147,7 +150,7 @@ %D Experimental: -\normalprotected\def\startluaparameterset[#1]% +\protected\def\startluaparameterset[#1]% {\begingroup \obeylualines \obeyluatokens @@ -186,7 +189,7 @@ %D \ctxluacode{context("%0.5f",1/3)} %D \stoptyping -\normalprotected\def\ctxluacode +\protected\def\ctxluacode {\begingroup \obeylualines \obeyluatokens @@ -217,7 +220,7 @@ \installsystemnamespace{ctxfunction} -\normalprotected\def\startctxfunctiondefinition #1 % +\protected\def\startctxfunctiondefinition #1 % {\begingroup \obeylualines \obeyluatokens \luat_start_lua_function_definition_indeed{#1}} \installsystemnamespace{luafunction} @@ -227,13 +230,13 @@ \expandafter\chardef\csname\??luafunction#1\endcsname\ctxcommand{ctxfunction(\!!bs#2\!!es)}\relax \expandafter\edef\csname#1\endcsname{\noexpand\luafunction\csname\??luafunction#1\endcsname}} -\normalprotected\def\setctxluafunction#1#2% experiment +\protected\def\setctxluafunction#1#2% experiment {\expandafter\chardef\csname\??luafunction#1\endcsname#2\relax \expandafter\edef\csname#1\endcsname{\noexpand\luafunction\csname\??luafunction#1\endcsname}} \let\stopctxfunctiondefinition\relax -\normalprotected\def\startctxfunction #1 % +\protected\def\startctxfunction #1 % {\begingroup \obeylualines \obeyluatokens \luat_start_lua_function_indeed{#1}} \def\luat_start_lua_function_indeed#1#2\stopctxfunction @@ -267,23 +270,23 @@ % \ifdefined\normalluadef - \normalprotected\def\installctxfunction#1#2% expandable + \protected\def\installctxfunction#1#2% expandable {\edef\m_syst_name{\csstring#1}% \global\expandafter\normalluadef\csname\m_syst_name\endcsname\ctxcommand{ctxfunction(\!!bs#2\!!es,true)}\relax} - \normalprotected\def\installctxscanner#1#2% expandable + \protected\def\installctxscanner#1#2% expandable {\edef\m_syst_name{\csstring#1}% \global\expandafter\normalluadef\csname\m_syst_name\endcsname\ctxcommand{ctxscanner("\m_syst_name",\!!bs#2\!!es,true)}\relax} - \normalprotected\def\installprotectedctxfunction#1#2% protected + \protected\def\installprotectedctxfunction#1#2% protected {\edef\m_syst_name{\csstring#1}% - \global\normalprotected\expandafter\normalluadef\csname\m_syst_name\endcsname\ctxcommand{ctxfunction(\!!bs#2\!!es,true)}\relax} + \global\protected\expandafter\normalluadef\csname\m_syst_name\endcsname\ctxcommand{ctxfunction(\!!bs#2\!!es,true)}\relax} - \normalprotected\def\installprotectedctxscanner#1#2% protected + \protected\def\installprotectedctxscanner#1#2% protected {\edef\m_syst_name{\csstring#1}% - \global\normalprotected\expandafter\normalluadef\csname\m_syst_name\endcsname\ctxcommand{ctxscanner("\m_syst_name",\!!bs#2\!!es,true)}\relax} + \global\protected\expandafter\normalluadef\csname\m_syst_name\endcsname\ctxcommand{ctxscanner("\m_syst_name",\!!bs#2\!!es,true)}\relax} - \normalprotected\def\resetctxscanner#1% + \protected\def\resetctxscanner#1% {\edef\m_syst_name{\csstring#1}% \expandafter\glet\csname\m_syst_name\endcsname\relax} @@ -295,53 +298,53 @@ % \else % % \ifdefined\luafunctioncall \else -% \normalprotected\def\luafunctioncall{\luafunction} +% \protected\def\luafunctioncall{\luafunction} % \fi % -% \normalprotected\def\installctxfunction#1#2% expandable +% \protected\def\installctxfunction#1#2% expandable % {\edef\m_syst_name{\csstring#1}% % \global\expandafter\chardef\csname\??luafunction\m_syst_name\endcsname\ctxcommand{ctxfunction("#2",true)}\relax % \expandafter\xdef\csname\m_syst_name\endcsname{\noexpand\luafunction\csname\??luafunction\m_syst_name\endcsname}} % -% \normalprotected\def\installctxscanner#1#2% expandable +% \protected\def\installctxscanner#1#2% expandable % {\edef\m_syst_name{\csstring#1}% % \global\expandafter\chardef\csname\??luafunction\m_syst_name\endcsname\ctxcommand{ctxscanner("\m_syst_name","#2",true)}\relax % \expandafter\xdef\csname\m_syst_name\endcsname{\noexpand\luafunction\csname\??luafunction\m_syst_name\endcsname}} % -% \normalprotected\def\installprotectedctxfunction#1#2% protected +% \protected\def\installprotectedctxfunction#1#2% protected % {\edef\m_syst_name{\csstring#1}% % \global\expandafter\chardef\csname\??luafunction\m_syst_name\endcsname\ctxcommand{ctxfunction("#2",true)}\relax % \expandafter\xdef\csname\m_syst_name\endcsname{\noexpand\luafunctioncall\csname\??luafunction\m_syst_name\endcsname}} % -% \normalprotected\def\installprotectedctxscanner#1#2% protected +% \protected\def\installprotectedctxscanner#1#2% protected % {\edef\m_syst_name{\csstring#1}% % \global\expandafter\chardef\csname\??luafunction\m_syst_name\endcsname\ctxcommand{ctxscanner("\m_syst_name","#2",true)}\relax % \expandafter\xdef\csname\m_syst_name\endcsname{\noexpand\luafunctioncall\csname\??luafunction\m_syst_name\endcsname}} % -% \normalprotected\def\resetctxscanner#1% +% \protected\def\resetctxscanner#1% % {\edef\m_syst_name{\csstring#1}% % \global\expandafter\chardef\csname\??luafunction\m_syst_name\endcsname\zerocount % \expandafter\glet\csname\m_syst_name\endcsname\relax} % -% % \normalprotected\def\installctxfunctioncall#1#2% +% % \protected\def\installctxfunctioncall#1#2% % % {\edef\m_syst_name{\csstring#1}% % % \global\expandafter\chardef\csname\??luafunction\m_syst_name\endcsname\ctxcommand{ctxfunction("#2",true)}\relax % % \expandafter\xdef\csname\m_syst_name\endcsname{\luafunctioncall\csname\??luafunction\m_syst_name\endcsname}} % % -% % \normalprotected\def\installctxscannercall#1#2% +% % \protected\def\installctxscannercall#1#2% % % {\edef\m_syst_name{\csstring#1}% % % \global\expandafter\chardef\csname\??luafunction\m_syst_name\endcsname\ctxcommand{ctxscanner("\m_syst_name","#2",true)}\relax % % \expandafter\xdef\csname\m_syst_name\endcsname{\luafunctioncall\csname\??luafunction\m_syst_name\endcsname}} % % -% % \normalprotected\def\installprotectedctxfunctioncall#1#2% +% % \protected\def\installprotectedctxfunctioncall#1#2% % % {\edef\m_syst_name{\csstring#1}% % % \global\expandafter\chardef\csname\??luafunction\m_syst_name\endcsname\ctxcommand{ctxfunction("#2",true)}\relax -% % \normalprotected\expandafter\xdef\csname\m_syst_name\endcsname{\luafunctioncall\csname\??luafunction\m_syst_name\endcsname}} +% % \protected\expandafter\xdef\csname\m_syst_name\endcsname{\luafunctioncall\csname\??luafunction\m_syst_name\endcsname}} % % -% % \normalprotected\def\installprotectedctxscannercall#1#2% +% % \protected\def\installprotectedctxscannercall#1#2% % % {\edef\m_syst_name{\csstring#1}% % % \global\expandafter\chardef\csname\??luafunction\m_syst_name\endcsname\ctxcommand{ctxscanner("\m_syst_name","#2",true)}\relax -% % \normalprotected\expandafter\xdef\csname\m_syst_name\endcsname{\luafunctioncall\csname\??luafunction\m_syst_name\endcsname}} +% % \protected\expandafter\xdef\csname\m_syst_name\endcsname{\luafunctioncall\csname\??luafunction\m_syst_name\endcsname}} % % \fi |