diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/page-mar.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/page-mar.mkiv | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/context/base/page-mar.mkiv b/Master/texmf-dist/tex/context/base/page-mar.mkiv index b85a99aa618..464b4f9bb09 100644 --- a/Master/texmf-dist/tex/context/base/page-mar.mkiv +++ b/Master/texmf-dist/tex/context/base/page-mar.mkiv @@ -46,7 +46,7 @@ %D therefore embed them in some macro's that (force and) %D remove the indentation and restore it afterwards. -\def\definemarginline +\unexpanded\def\definemarginline {\dodoubleargument\dodefinemarginline} \def\dodefinemarginline[#1][#2]% @@ -58,7 +58,7 @@ \c!hoffset=\leftmargindistance, \c!command=, #2]% - \unexpanded\setvalue{#1}{\dohandlemarginline{#1}}} + \setuvalue{#1}{\dohandlemarginline{#1}}} \def\marginlineparameter #1{\csname\??im\??im\currentmarginline#1\endcsname} \def\marginlineexecuter #1#2{\executeifdefined{\??im\??im\currentmarginline#1}{#2}} @@ -120,9 +120,6 @@ \definemarginline[atleftmargin] [\c!location=\v!left, \c!command=\lrlap,\c!width=\zeropoint,\c!distance=\zeropoint,\c!hoffset=\zeropoint] \definemarginline[atrightmargin][\c!location=\v!right,\c!command=\rllap,\c!width=\zeropoint,\c!distance=\zeropoint,\c!hoffset=\zeropoint] -\ifx\lrlap\undefined \def\lrlap#1{\llap{\rlap{#1}}} \fi -\ifx\rllap\undefined \def\rllap#1{\rlap{\llap{#1}}} \fi - \def\lrlap#1{\llap{\rlap{#1}}} \def\rllap#1{\rlap{\hskip\hsize\llap{#1}}} @@ -196,7 +193,7 @@ \newcount\margincontentlevel \newdimen\margincontentheight -\def\setupinmargin +\unexpanded\def\setupinmargin {\dodoubleempty\dosetupinmargin} \def\dosetupinmargin[#1][#2]% @@ -439,7 +436,7 @@ \makemargintextblock\v!right\v!left{#2}% \rlap{\placemargincontentseparator}}} -\def\placemargincontentseparator +\unexpanded\def\placemargincontentseparator {\ifnum\margincontentlevel>\zerocount \ifx\margincontentseparator\empty\else \bgroup @@ -502,7 +499,7 @@ {\dodoinmargin[#1][#2][#3][#4][#5]} {\dodoinmargin[#1][#2][#3][][#4]}} -\def\defineinmargin +\unexpanded\def\defineinmargin {\doquadrupleempty\dodefineinmargin} \def\dodefineinmargin[#1][#2][#3][#4]% @@ -764,7 +761,7 @@ \global\chardef\margintextcollected\zerocount \global\collectedmargintexts\emptytoks} -\def\placemargincontent +\unexpanded\def\placemargincontent {\ifcase\margintextcollected\else % was level check \bgroup \redoconvertfont % !! @@ -775,7 +772,7 @@ % For old times sake (i use it in project styles) we provide -\def\placemargintexts {\placemargincontent} +\unexpanded\def\placemargintexts {\placemargincontent} \def\resetmargetitels {\resetmargincontent} \def\margewoordpositie{\margewoord} % obsolete, now no longer range |