summaryrefslogtreecommitdiff
path: root/tex/context/base/page-mar.mkiv
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2010-05-22 12:06:00 +0200
committerHans Hagen <pragma@wxs.nl>2010-05-22 12:06:00 +0200
commit767a0960d500d3e291c9e93f6737375275da564e (patch)
treefff6f01c9e3be5d139a087d2f79720e371a69d27 /tex/context/base/page-mar.mkiv
parentc8a356da3949f5bf1a19e5309728fb3985059ef1 (diff)
downloadcontext-767a0960d500d3e291c9e93f6737375275da564e.tar.gz
beta 2010.05.22 12:06
Diffstat (limited to 'tex/context/base/page-mar.mkiv')
-rw-r--r--tex/context/base/page-mar.mkiv12
1 files changed, 6 insertions, 6 deletions
diff --git a/tex/context/base/page-mar.mkiv b/tex/context/base/page-mar.mkiv
index 09f0d7e6b..464b4f9bb 100644
--- a/tex/context/base/page-mar.mkiv
+++ b/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]%
@@ -193,7 +193,7 @@
\newcount\margincontentlevel
\newdimen\margincontentheight
-\def\setupinmargin
+\unexpanded\def\setupinmargin
{\dodoubleempty\dosetupinmargin}
\def\dosetupinmargin[#1][#2]%
@@ -436,7 +436,7 @@
\makemargintextblock\v!right\v!left{#2}%
\rlap{\placemargincontentseparator}}}
-\def\placemargincontentseparator
+\unexpanded\def\placemargincontentseparator
{\ifnum\margincontentlevel>\zerocount
\ifx\margincontentseparator\empty\else
\bgroup
@@ -499,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]%
@@ -761,7 +761,7 @@
\global\chardef\margintextcollected\zerocount
\global\collectedmargintexts\emptytoks}
-\def\placemargincontent
+\unexpanded\def\placemargincontent
{\ifcase\margintextcollected\else % was level check
\bgroup
\redoconvertfont % !!
@@ -772,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