diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/type-ini.mkvi')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/type-ini.mkvi | 90 |
1 files changed, 39 insertions, 51 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/type-ini.mkvi b/Master/texmf-dist/tex/context/base/mkiv/type-ini.mkvi index ac5f6af2f95..2ac3ee2071f 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/type-ini.mkvi +++ b/Master/texmf-dist/tex/context/base/mkiv/type-ini.mkvi @@ -45,30 +45,18 @@ \let\currenttypescripts\empty \let\currenttypefile \empty -\installmacrostack\currenttypefile - \let\typescriptone \empty % public, used in typescripts \let\typescripttwo \empty % public, used in typescripts \let\typescriptthree\empty % public, used in typescripts -\installmacrostack\typescriptone -\installmacrostack\typescripttwo -\installmacrostack\typescriptthree - \let\fontclassstyle \empty -\installmacrostack\fontclassstyle - \let\m_font_typescripts_one \empty \let\m_font_typescripts_two \empty \let\m_font_typescripts_three\empty \let\m_font_typescripts_check\empty \let\m_font_typescripts_match\empty -\installmacrostack\m_font_typescripts_one -\installmacrostack\m_font_typescripts_two -\installmacrostack\m_font_typescripts_three - \let\t_font_typescripts\relax % uses as synonym \installcorenamespace{typescriptcache} @@ -87,9 +75,6 @@ \let\typescriptmethod\plusone % 1: empty==all==true 2: empty==false \let\typescriptstate \plustwo % 1: process 2: store -\installmacrostack\typescriptmethod -\installmacrostack\typescriptstate - \unexpanded\def\starttypescriptcollection {\dosingleempty\font_typescripts_collection_start} @@ -110,21 +95,19 @@ \def\font_typescripts_use_one{\let\typescriptmethod\plusone\font_typescripts_use} \def\font_typescripts_use_two{\let\typescriptmethod\plustwo\font_typescripts_use} -\installmacrostack\stoptypescript - \unexpanded\def\font_typescripts_use[#one][#two][#three]% - {\push_macro_m_font_typescripts_one - \push_macro_m_font_typescripts_two - \push_macro_m_font_typescripts_three + {\pushmacro\m_font_typescripts_one + \pushmacro\m_font_typescripts_two + \pushmacro\m_font_typescripts_three \edef\m_font_typescripts_one {\truetypescript{#one}}% \edef\m_font_typescripts_two {\truetypescript{#two}}% \edef\m_font_typescripts_three{\truetypescript{#three}}% - \push_macro_typescriptone - \push_macro_typescripttwo - \push_macro_typescriptthree - \push_macro_typescriptmethod - \push_macro_typescriptstate - \push_macro_stoptypescript + \pushmacro\typescriptone + \pushmacro\typescripttwo + \pushmacro\typescriptthree + \pushmacro\typescriptmethod + \pushmacro\typescriptstate + \pushmacro\stoptypescript \typescriptfoundfalse \let\typescriptstate\plusone % why \iftracetypescripts @@ -136,15 +119,15 @@ \font_typescripts_use_display \fi \setfalse\c_font_typescripts_first_pass - \pop_macro_stoptypescript - \pop_macro_typescriptstate - \pop_macro_typescriptmethod - \pop_macro_typescriptthree - \pop_macro_typescripttwo - \pop_macro_typescriptone - \pop_macro_m_font_typescripts_three - \pop_macro_m_font_typescripts_two - \pop_macro_m_font_typescripts_one} + \popmacro\stoptypescript + \popmacro\typescriptstate + \popmacro\typescriptmethod + \popmacro\typescriptthree + \popmacro\typescripttwo + \popmacro\typescriptone + \popmacro\m_font_typescripts_three + \popmacro\m_font_typescripts_two + \popmacro\m_font_typescripts_one} \def\font_typescripts_use_display {\processcommacommand[\typescriptfiles]\font_typescripts_load_file @@ -187,10 +170,10 @@ % 1 then, it doesn't get stored without doing that explicitly \unexpanded\def\loadtypescriptfile[#1]% - {\push_macro_typescriptstate + {\pushmacro\typescriptstate \let\typescriptstate\plustwo % assumes 2 at the outer level \clf_loadtypescriptfile{#1}% - \pop_macro_typescriptstate} + \popmacro\typescriptstate} \unexpanded\def\loadfoundtypescriptfile#1% {\startreadingfile @@ -208,26 +191,30 @@ {\global\advance\c_font_typescripts_n_of_preloaded\plusone \expandafter\normalgdef\csname\??typescriptcache\the\c_font_typescripts_n_of_preloaded\endcsname {\starttypescript#definitions\stoptypescript}% - \gtoksapp\t_font_typescripts\expandafter - {\csname\??typescriptcache\the\c_font_typescripts_n_of_preloaded\endcsname}} + %\normalexpanded{\global\t_font_typescripts{\the\expandafter\t_font_typescripts\noexpand\csname\??typescriptcache\the\c_font_typescripts_n_of_preloaded\endcsname}}} + \global\t_font_typescripts\expandafter\expandafter\expandafter + {\expandafter\the\expandafter\t_font_typescripts + \csname\??typescriptcache\the\c_font_typescripts_n_of_preloaded\endcsname}} \def\font_typescripts_collection_start_store#definitions\stoptypescriptcollection {\global\advance\c_font_typescripts_n_of_preloaded\plusone \expandafter\normalgdef\csname\??typescriptcache\the\c_font_typescripts_n_of_preloaded\endcsname {\starttypescriptcollection#definitions\stoptypescriptcollection}% - \gtoksapp\t_font_typescripts\expandafter - {\csname\??typescriptcache\the\c_font_typescripts_n_of_preloaded\endcsname}} + %\normalexpanded{\global\t_font_typescripts{\the\expandafter\t_font_typescripts\noexpand\csname\??typescriptcache\the\c_font_typescripts_n_of_preloaded\endcsname}}} + \global\t_font_typescripts\expandafter\expandafter\expandafter + {\expandafter\the\expandafter\t_font_typescripts + \csname\??typescriptcache\the\c_font_typescripts_n_of_preloaded\endcsname}} \def\font_typescripts_load_file#filename% {\setfalse\c_font_typescripts_quit - \push_macro_currenttypefile + \pushmacro\currenttypefile \def\currenttypefile{#filename}% \ifconditional\c_font_typescripts_preload \font_typescript_process_typescript_file_and_store \else \font_typescript_process_typescript_file \fi - \pop_macro_currenttypefile + \popmacro\currenttypefile \ifconditional\c_font_typescripts_quit \quitcommalist \setfalse\c_font_typescripts_quit @@ -307,7 +294,8 @@ \def\font_typescripts_start_gobble#definitions\stoptypescript{} \def\font_typescripts_start_document#definitions\stoptypescript - {\toksapp\c_font_typescripts_document{\starttypescript#definitions\stoptypescript}} + %{\appendtoks\starttypescript#definitions\stoptypescript\to\c_font_typescripts_document} + {\c_font_typescripts_document\expandafter{\the\c_font_typescripts_document\starttypescript#definitions\stoptypescript}} \def\font_typescripts_start_process % could be a faster \doifelsenextoptionalif needed {\let\typescriptone \m_font_typescripts_one @@ -356,10 +344,10 @@ \let\font_typescripts_start_process_again_three\font_typescripts_start_process_yes \def\font_typescripts_start_process_indeed - {\push_macro_fontclass} + {\pushmacro\fontclass} \unexpanded\def\stoptypescript - {\pop_macro_fontclass} + {\popmacro\fontclass} \def\font_typescripts_check#asked#target#followup[#value]% script use value next {\donefalse @@ -533,8 +521,8 @@ \let\@@tsdirection \empty \let\@@tsdesignsize\empty \geteparameters[\??ts][#settings]% todo raw - \push_macro_fontclass - \push_macro_fontclassstyle + \pushmacro\fontclass + \pushmacro\fontclassstyle \setcurrentfontclass{#name}% \savefontclassparameters{#style}\@@tsrscale\@@tsfeatures\@@tsfallbacks\@@tsgoodies\@@tsdesignsize\@@tsdirection \the\everybeforedefinetypeface} @@ -548,8 +536,8 @@ \def\font_typefaces_defining_stop {\the\everyafterdefinetypeface - \pop_macro_fontclassstyle - \pop_macro_fontclass} + \popmacro\fontclassstyle + \popmacro\fontclass} \def\dofastdefinetypeface#name#style#fontshape#fontsize#settings% called from the lua end (via case d) {\font_typefaces_define_indeed[#name][#style]% @@ -609,7 +597,7 @@ {\doifelsenothing{#styles} {\font_typescripts_inherit_indeed[#name][\s!rm,\s!ss,\s!tt,\s!mm][\fontclass]} {\doifnot{#name}{#parentclass} - {\glet\font_typescripts_inherit_check\font_typescripts_inherit_check_indeed + {\global\let\font_typescripts_inherit_check\font_typescripts_inherit_check_indeed \def\font_typescripts_inherit_check_step#style{\setevalue{\??typescriptinheritances#name:#style}{#parentclass}}% \processcommalist[#styles]\font_typescripts_inherit_check_step}}} |