diff options
Diffstat (limited to 'tex/context/base/core-mar.tex')
-rw-r--r-- | tex/context/base/core-mar.tex | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/tex/context/base/core-mar.tex b/tex/context/base/core-mar.tex index bb9fc0eca..3552137a6 100644 --- a/tex/context/base/core-mar.tex +++ b/tex/context/base/core-mar.tex @@ -1,5 +1,5 @@ %D \module -%D [ file=core-mar, +%D [ filefile=core-mar, %D version=1997.03.31, %D title=\CONTEXT\ Core Macros, %D subtitle=Markings, @@ -36,13 +36,13 @@ \beginTEX \def\mainmarking#1% - {\@EA\ifx\csname\??mk#1\c!koppeling\endcsname\else - \csname\??mk#1\c!koppeling\endcsname + {\@EA\ifx\csname\??mk#1\c!coupling\endcsname\else + \csname\??mk#1\c!coupling\endcsname \fi} \def\fastresetmarker#1% - {\@EA\ifx\csname\??mk#1\c!koppeling\endcsname\else - \@EA\resetmark\csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname + {\@EA\ifx\csname\??mk#1\c!coupling\endcsname\else + \@EA\resetmark\csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname \fi} \endTEX @@ -50,13 +50,13 @@ \beginETEX \ifcsname \def\mainmarking#1% - {\ifcsname\??mk#1\c!koppeling\endcsname - \csname\??mk#1\c!koppeling\endcsname + {\ifcsname\??mk#1\c!coupling\endcsname + \csname\??mk#1\c!coupling\endcsname \fi} \def\fastresetmarker#1% - {\ifcsname\??mk#1\c!koppeling\endcsname - \@EA\resetmark\csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname + {\ifcsname\??mk#1\c!coupling\endcsname + \@EA\resetmark\csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname \fi} \endETEX @@ -79,10 +79,10 @@ % betere protectie -\letvalue{\??mk\??mk \v!vorige}\gettopmark -\letvalue{\??mk\??mk \v!eerste}\getfirstmark -\letvalue{\??mk\??mk\v!laatste}\getbotmark -\letvalue{\??mk\??mk\v!huidige}\getcurrentmark +\letvalue{\??mk\??mk \v!previous}\gettopmark +\letvalue{\??mk\??mk \v!first}\getfirstmark +\letvalue{\??mk\??mk\v!last}\getbotmark +\letvalue{\??mk\??mk\v!current}\getcurrentmark % todo: make it work in balancing % @@ -98,19 +98,19 @@ % \stopcolumns % \stoptext -\letvalue{\??mk\??mk\v!kolom:\v!eerste }\getsplitfirstmark -\letvalue{\??mk\??mk\v!kolom:\v!laatste}\getsplitbottommark +\letvalue{\??mk\??mk\v!column:\v!first }\getsplitfirstmark +\letvalue{\??mk\??mk\v!column:\v!last}\getsplitbottommark \ifx\decouplemarking\undefined \def\decouplemarking[#1]{} \fi \def\dododefinemarking[#1][#2]% {\getparameters[\??mk#1] - [\c!expansie=\v!nee, % saves a macro - \c!scheider={ --- }, % watch the spaces + [\c!expansion=\v!no, % saves a macro + \c!separator={ --- }, % watch the spaces \c!limittext=\@@kolimittext, - \c!status=\v!start]% + \c!state=\v!start]% \decouplemarking[#1]% % no coupling with sections - \setevalue{\??mk#1\c!koppeling}{#2}% + \setevalue{\??mk#1\c!coupling}{#2}% \expandafter\newmark\csname\??mk#2\endcsname \showmessage\m!systems{13}{#1,[#2]}} @@ -124,11 +124,11 @@ \def\definerawmarking[#1]% global ! ! ! ! {\getgparameters[\??mk#1] - [\c!expansie=\v!nee, % saves a macro - \c!scheider={ --- }, % watch the spaces + [\c!expansion=\v!no, % saves a macro + \c!separator={ --- }, % watch the spaces \c!limittext=, - \c!status=\v!start]% - \setxvalue{\??mk#1\c!koppeling}{#1}% + \c!state=\v!start]% + \setxvalue{\??mk#1\c!coupling}{#1}% \expandafter\newmark\csname\??mk#1\endcsname \showmessage\m!systems{13}{#1}} @@ -144,9 +144,9 @@ \beginTEX \def\fetchmark[#1][#2]% never \unexpanded - {\@EA\ifx\csname\??mk#1\c!koppeling\endcsname\else + {\@EA\ifx\csname\??mk#1\c!coupling\endcsname\else \@EA\@EA\csname\??mk\??mk#2\endcsname - \csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname + \csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname \fi} \endTEX @@ -154,40 +154,40 @@ \beginETEX \ifcsname \def\fetchmark[#1][#2]% never \unexpanded - {\ifcsname\??mk#1\c!koppeling\endcsname + {\ifcsname\??mk#1\c!coupling\endcsname % \@EA\@EA\csname\??mk\??mk#2\endcsname - % \csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname + % \csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname \csname\??mk\??mk#2\@EA\endcsname - \csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname + \csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname \fi} \endETEX \def\fetchtwomarks[#1]% - {\doifsomething{\fetchmark[#1][\v!eerste]} - {\fetchmark[#1][\v!eerste]% - \doifsomething{\fetchmark[#1][\v!laatste]} - {\doifnot{\fetchmark[#1][\v!eerste]}{\fetchmark[#1][\v!laatste]} - {\getvalue{\??mk#1\c!scheider}\fetchmark[#1][\v!laatste]}}}} + {\doifsomething{\fetchmark[#1][\v!first]} + {\fetchmark[#1][\v!first]% + \doifsomething{\fetchmark[#1][\v!last]} + {\doifnot{\fetchmark[#1][\v!first]}{\fetchmark[#1][\v!last]} + {\getvalue{\??mk#1\c!separator}\fetchmark[#1][\v!last]}}}} \def\fetchallmarks[#1]% - {\doifsomething{\fetchmark[#1][\v!eerste]} - {\doifsomething{\fetchmark[#1][\v!vorige]} - {\doifnot{\fetchmark[#1][\v!vorige]}{\fetchmark[#1][\v!eerste]} - {\fetchmark[#1][\v!vorige]\getvalue{\??mk#1\c!scheider}}}}% + {\doifsomething{\fetchmark[#1][\v!first]} + {\doifsomething{\fetchmark[#1][\v!previous]} + {\doifnot{\fetchmark[#1][\v!previous]}{\fetchmark[#1][\v!first]} + {\fetchmark[#1][\v!previous]\getvalue{\??mk#1\c!separator}}}}% \fetchtwomarks[#1]} \def\dogetmarking[#1][#2]% - {\doifvalue{\??mk#1\c!status}\v!start + {\doifvalue{\??mk#1\c!state}\v!start {\bgroup %\def\nomarking##1{\unknown\ }% \def\nomarking{\splitsequence{\getvalue{\??mk#1\c!limittext}}}% \setfullsectionnumber{\??mk#1}% \processaction % slow [#2] - [ \v!beide=>{\fetchtwomarks[#1]}, - \v!alles=>{\fetchallmarks[#1]}, - \s!default=>{\fetchmark [#1][\v!eerste]}, + [ \v!both=>{\fetchtwomarks[#1]}, + \v!all=>{\fetchallmarks[#1]}, + \s!default=>{\fetchmark [#1][\v!first]}, \s!unknown=>{\fetchmark [#1][#2]}]% \egroup}} @@ -202,11 +202,11 @@ \beginTEX \def\domarking[#1]#2% - {\@EA\ifx\csname\??mk#1\c!koppeling\endcsname\else + {\@EA\ifx\csname\??mk#1\c!coupling\endcsname\else \bgroup - \doifelsevalue{\??mk#1\c!expansie}\v!ja + \doifelsevalue{\??mk#1\c!expansion}\v!yes \expandmarkstrue\expandmarksfalse - \@EA\setsomemark\csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname{#2}% + \@EA\setsomemark\csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname{#2}% \egroup \fi} @@ -215,11 +215,11 @@ \beginETEX \ifcsname \def\domarking[#1]#2% - {\ifcsname\??mk#1\c!koppeling\endcsname + {\ifcsname\??mk#1\c!coupling\endcsname \bgroup - \doifelsevalue{\??mk#1\c!expansie}\v!ja + \doifelsevalue{\??mk#1\c!expansion}\v!yes \expandmarkstrue\expandmarksfalse - \@EA\setsomemark\csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname{#2}% + \@EA\setsomemark\csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname{#2}% \egroup \fi} @@ -231,7 +231,7 @@ %D Used in placing text lines. \def\doifelsemarking#1% - {\ifundefined{\??mk#1\c!koppeling}% + {\ifundefined{\??mk#1\c!coupling}% \expandafter\secondoftwoarguments \else \expandafter\firstoftwoarguments |