diff options
Diffstat (limited to 'tex/context/base/core-new.tex')
-rw-r--r-- | tex/context/base/core-new.tex | 106 |
1 files changed, 48 insertions, 58 deletions
diff --git a/tex/context/base/core-new.tex b/tex/context/base/core-new.tex index 908414e72..9c5ec0578 100644 --- a/tex/context/base/core-new.tex +++ b/tex/context/base/core-new.tex @@ -272,18 +272,15 @@ % todo : \startsetups[name][XML] \setups[name][XML] \expanded - {\long\def\@EA\noexpand\csname\e!start\v!instellingen\endcsname + {\long\def\@EA\noexpand\csname\e!start\v!setups\endcsname {\bgroup\noexpand\doifnextcharelse[% - {\noexpand\startsetupsA\@EA\noexpand\csname\e!stop\v!instellingen\endcsname} - {\noexpand\startsetupsB\@EA\noexpand\csname\e!stop\v!instellingen\endcsname}}} + {\noexpand\startsetupsA\@EA\noexpand\csname\e!stop\v!setups\endcsname} + {\noexpand\startsetupsB\@EA\noexpand\csname\e!stop\v!setups\endcsname}}} -\letvalue{\e!stop\v!instellingen}\relax +\letvalue{\e!stop\v!setups}\relax -\unexpanded \def\setups % {..} or [..] - {\doifnextcharelse\bgroup\dosetupsA\dosetupsB} - -\unexpanded \def\setup % {..} or [..] - {\doifnextcharelse\bgroup\dosetups\dosetupsC} +\unexpanded \def\setups{\doifnextcharelse\bgroup\dosetupsA\dosetupsB} % {..} or [..] +\unexpanded \def\setup {\doifnextcharelse\bgroup\dosetups \dosetupsC} % {..} or [..] \def\dosetupsA #1{\processcommacommand[#1]\dosetups} % {..} \def\dosetupsB[#1]{\processcommacommand[#1]\dosetups} % [..] @@ -297,35 +294,28 @@ \def\doifsetupselse#1% to be done: grid {\doifdefinedelse{\??su:#1}} -\def\startsetups % for international purposes - {\bgroup\doifnextcharelse[{\startsetupsA\stopsetups}{\startsetupsB\stopsetups}} +\chardef\setupseolmode\plusone -\def\startlocalsetups % for nested purposes - {\bgroup\doifnextcharelse[{\startsetupsA\stoplocalsetups}{\startsetupsB\stoplocalsetups}} +\def\startsetups {\xxstartsetups\plusone \stopsetups } \let\stopsetups \relax +\def\startlocalsetups{\xxstartsetups\plusone \stoplocalsetups} \let\stoplocalsetups\relax +\def\startrawsetups {\xxstartsetups\zerocount\stoprawsetups } \let\stoprawsetups \relax -\let\stopsetups \relax -\let\stoplocalsetups\relax +\def\xxstartsetups#1#2% + {\bgroup\chardef\setupseolmode#1\doifnextcharelse[{\startsetupsA#2}{\startsetupsB#2}} -\def\startsetupsA#1% - {\catcode`\^^M\@@ignore +\def\startsetupsA#1% [ ] delimited + {\ifcase\setupseolmode\or\catcode`\^^M\@@ignore\fi \dotripleempty\dostartsetups[#1]} -\def\startsetupsB#1#2 % space delimited / kind of obsolete - {\catcode`\^^M\@@ignore +\def\startsetupsB#1#2 % space delimited + {\ifcase\setupseolmode\or\catcode`\^^M\@@ignore\fi \dodostartsetups#1\empty{#2}} -\def\dostartsetups - {\ifthirdargument - \@EA\startsetupsC - \else - \@EA\startsetupsD - \fi} - -\def\startsetupsC[#1][#2][#3]% [..] [..] - {\dodostartsetups#1{#2}{#3}} +\def\startsetupsC[#1][#2][#3]{\dodostartsetups#1{#2}{#3}} % [..] [..] +\def\startsetupsD[#1][#2][#3]{\dodostartsetups#1\empty{#2}} % [..] -\def\startsetupsD[#1][#2][#3]% [..] - {\dodostartsetups#1\empty{#2}} +\def\dostartsetups + {\ifthirdargument\@EA\startsetupsC\else\@EA\startsetupsD\fi} \long\def\dodostartsetups#1#2#3% watch out: not \grabuntil {\dograbuntil#1{\egroup\long\setvalue{\??su#2:#3}}} @@ -363,7 +353,7 @@ % {\ifsecondargument % \catcode`\<=\@@active % \def<{\ifmmode\expandafter\normalless\else\expandafter\doshortcut\fi}% -% \getparameters[\??te#1][\c!commandos=,\c!commando=,\c!letter=,\c!kleur=,#2]% +% \getparameters[\??te#1][\c!commands=,\c!command=,\c!style=,\c!color=,#2]% % \else % \defineshortcut[][#1]% % \fi} @@ -381,17 +371,17 @@ % % \def\dododoshortcut#1:#2\end % {\doifelsenothing{#2} -% {\doifundefinedelse{\??te\c!commandos} +% {\doifundefinedelse{\??te\c!commands} % {\shortcut} % {\@EA\dodododoshortcut\@EA\??te\@EA:\shortcut:\end}} -% {\doifundefinedelse{\??te#1\c!commandos} +% {\doifundefinedelse{\??te#1\c!commands} % {\shortcut} % {\dodododoshortcut\??te#1:#2\end}}% % \egroup} % % \def\dodododoshortcut#1:#2:\end -% {\getvalue{#1\c!commandos}% -% \doattributes{#1}\c!letter\c!kleur{\getvalue{#1\c!commando}{#2}}} +% {\getvalue{#1\c!commands}% +% \doattributes{#1}\c!style\c!color{\getvalue{#1\c!command}{#2}}} \def\defineshortcut {\dotripleargument\dodefineshortcut} @@ -412,7 +402,7 @@ \defineactivecharacter #1 {\@EA\doshortcut\string#2} % \getparameters [\??te\string#2#3] - [\c!commandos=,\c!commando=,\c!letter=,\c!kleur=,#4]} + [\c!commands=,\c!command=,\c!style=,\c!color=,#4]} \def\doshortcut#1% {\ifmmode @@ -429,27 +419,27 @@ \def\dododoshortcut#1:#2\end {\doifelsenothing{#2} - {\doifundefinedelse{\shorttag\c!commandos} + {\doifundefinedelse{\shorttag\c!commands} {\shortcut} {\@EA\dodododoshortcut\@EA\shorttag\@EA:\shortcut:\end}} - {\doifundefinedelse{\shorttag#1\c!commandos} + {\doifundefinedelse{\shorttag#1\c!commands} {\shortcut} {\dodododoshortcut\shorttag#1:#2\end}}% \egroup} \def\dodododoshortcut#1:#2:\end - {\getvalue{#1\c!commandos}% - \doattributes{#1}\c!letter\c!kleur{\getvalue{#1\c!commando}{#2}}} - -%D \defineshortcut [\c!letter=\v!type] -%D \defineshortcut [b] [\c!letter=\v!vet] -%D \defineshortcut [e] [\c!letter=\em] -%D \defineshortcut [t] [\c!letter=\v!type] -%D \defineshortcut [c] [\c!letter=\v!kap] -%D \defineshortcut [k] [\c!letter=\v!kap] -%D \defineshortcut [u] [\c!letter=\v!type,\c!commando=\hyphenatedurl] + {\getvalue{#1\c!commands}% + \doattributes{#1}\c!style\c!color{\getvalue{#1\c!command}{#2}}} + +%D \defineshortcut [style=type] +%D \defineshortcut [b] [style=bold] +%D \defineshortcut [e] [style=\em] +%D \defineshortcut [t] [style=type] +%D \defineshortcut [c] [style=cap] +%D \defineshortcut [k] [style=cap] +%D \defineshortcut [u] [style=type,command=\hyphenatedurl] %D -%D \startregels +%D \startlines %D test <ziezo> test %D test test <t:ziezo> %D test test <b:ziezo> @@ -461,21 +451,21 @@ %D test test <t:zi:ezo:> dat (zi:ezo:) %D well, <u:http://www.pragma-ade.nl> looks fuzzy %D $10<20$ -%D \stopregels +%D \stoplines %D -%D \defineshortcut [<>] [i] [\c!letter=\it] -%D \defineshortcut [()] [b] [\c!letter=\bf] -%D \defineshortcut [++] [s] [\c!letter=\sl] -%D \defineshortcut [//] [u] [\c!letter=\underbars] -%D \defineshortcut [--] [a] [\c!letter=\overstrike] +%D \defineshortcut [<>] [i] [style=\it] +%D \defineshortcut [()] [b] [style=\bf] +%D \defineshortcut [++] [s] [style=\sl] +%D \defineshortcut [//] [u] [style=\underbars] +%D \defineshortcut [--] [a] [style=\overstrike] %D -%D \startregels +%D \startlines %D it seems <i:to work> well %D it seems (b:to work) well %D it seems +s:to work+ well %D it seems /u:to work/ well %D it seems -a:to work- well -%D \stopregels +%D \stoplines % \def\setupenv{\dodoubleargument\rawgetparameters[\??en]} % @@ -545,4 +535,4 @@ \egroup -\protect \endinput
\ No newline at end of file +\protect \endinput |