summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/anch-pgr.mkiv
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-05-24 14:05:02 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-05-24 14:05:02 +0000
commit57ea7dad48fbf2541c04e434c31bde655ada3ac4 (patch)
tree1f8b43bc7cb92939271e1f5bec610710be69097f /Master/texmf-dist/tex/context/base/anch-pgr.mkiv
parent6ee41e1f1822657f7f23231ec56c0272de3855e3 (diff)
here is context 2010.05.24 13:05
git-svn-id: svn://tug.org/texlive/trunk@18445 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/anch-pgr.mkiv')
-rw-r--r--Master/texmf-dist/tex/context/base/anch-pgr.mkiv38
1 files changed, 21 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/context/base/anch-pgr.mkiv b/Master/texmf-dist/tex/context/base/anch-pgr.mkiv
index c558bb04fa8..248b9ca5e31 100644
--- a/Master/texmf-dist/tex/context/base/anch-pgr.mkiv
+++ b/Master/texmf-dist/tex/context/base/anch-pgr.mkiv
@@ -76,7 +76,7 @@
\fi
\fi\fi}
-\def\placepositionanchors % todo : depth pagebox
+\unexpanded\def\placepositionanchors % todo : depth pagebox
{\ifpositioning
\setbox\scratchbox\vbox to \textheight
{\simpletopskipcorrection
@@ -145,7 +145,7 @@
% obsolete and wrong anyway
%
-% \long\def\defineMPpositiongraphic#1%
+% \long\unexpanded\def\defineMPpositiongraphic#1%
% {\long\setvalue{\MPoverlayposprefix#1}}
%D The rest of the definitions concerning such overlays may
@@ -180,14 +180,14 @@
\vfill}%
\fi}
-\def\startpositionoverlay#1%
+\unexpanded\def\startpositionoverlay#1%
{\iftrialtypesetting % we don't want redundant entries in the list
\@EA\gobbleuntil\@EA\stoppositionoverlay
\else
\def\currentpositionoverlay{#1}%
\fi}
-\def\stoppositionoverlay
+\unexpanded\def\stoppositionoverlay
{\let\currentpositionoverlay\empty}
\def\resetpositionoverlay#1%
@@ -741,15 +741,15 @@
lineradius=\textbackgroundparameter\c!radius}}%
\stoppositionoverlay}
-\def\stoptextbackground
+\unexpanded\def\stoptextbackground
{\dodostoptextbackground
\carryoverpar\egroup}
-\def\starttextbackgroundmanual
+\unexpanded\def\starttextbackgroundmanual
{\dostartattributes{\??td\currenttextbackground}\c!style\c!color\empty
\fpos\currentparbackground\ignorespaces}
-\def\stoptextbackgroundmanual
+\unexpanded\def\stoptextbackgroundmanual
{\tpos\currentparbackground
\dostopattributes}
@@ -797,7 +797,7 @@
%
\dostartattributes{\??td\currenttextbackground}\c!style\c!color\empty
\nowhitespace
-\nobreak % new per 23/04/2006 (else potential break when whitespace)
+ \nobreak % new per 23/04/2006 (else potential break when whitespace)
\seteffectivehsize
\doinhibitblank % \blank[\v!disable]% new
\par}
@@ -816,7 +816,7 @@
\nobreak \vskip-\lineheight \nobreak
\nowhitespace
\egroup
-\bgroup \forgeteverypar % NOT REALLY NEEDED, SAVES HASH/MEM
+ \bgroup \forgeteverypar % NOT REALLY NEEDED, SAVES HASH/MEM
\nobreak \noindent \strut \hfill \kern\zeropoint
\doassignsomeskip\textbackgroundparameter\c!bottomoffset\to\textbackgroundskip
\ifgridsnapping % experimental, pascal (todo: topoffset in same way)
@@ -828,7 +828,7 @@
\else
\tpos\currentparbackground
\fi
-\egroup
+ \egroup
\endgraf % new
\textbackgroundparameter\c!after}
@@ -900,12 +900,13 @@
\else
\MPy#1-\MPy#2-\MPy\textanchor+\MPy\textanchor+\MPh\textanchor
\fi
- \fi}%
+ \fi
+ \relax}%
\edef\textparwidth
{\the\dimexpr
\ifcase\scratchcounter
% one page
- \dimexpr\MPx#2-\MPx#1%
+ \MPx#2-\MPx#1%
\else
% two or more pages / maybe also hang
\ifx#3\relax
@@ -913,7 +914,8 @@
\else
\MPw\MPparanchor-\MPl\MPparanchor-\MPr\MPparanchor
\fi
- \fi}}
+ \fi
+ \relax}}
\def\mintextparheight{4\lineheight}
@@ -935,7 +937,7 @@
\fi
\fi}
-\def\definetextbackground
+\unexpanded\def\definetextbackground
{\dodoubleempty\dodefinetextbackground}
\def\dodefinetextbackground[#1][#2]% parent and ..parameter
@@ -948,13 +950,13 @@
\c!leftoffset,\c!rightoffset,\c!topoffset,\c!bottomoffset]%
\getparameters[\??td#1][#2]%
\doifvalue{\??td#1\c!state}\v!start\checktextbackgrounds
- \unexpanded\setvalue{#1}%
+ \setuvalue{#1}%
{\groupedcommand{\starttextbackground[#1]}{\stoptextbackground}}%
\setvalue{\e!start#1}{\starttextbackground[#1]}%
\setvalue{\e!stop #1}{\stoptextbackground}%
\fi}
-\def\setuptextbackground
+\unexpanded\def\setuptextbackground
{\dodoubleargument\dosetuptextbackground}
\def\dosetuptextbackground[#1][#2]%
@@ -1029,6 +1031,8 @@
linecolor=blue,
linewidth=1pt]
+% these might become macros in mp-page
+
\startuseMPgraphic{mpos:common:ec}
path pa ; pair ca ; color lc ; numeric lw ;
lw := \MPvar{linewidth} ;
@@ -1632,7 +1636,7 @@
\copyposition{e:#1}{e:#2}%
\dosetpositionaction{b:#2}{\dopositionaction{b:#1}}}
-\def\definepositionframed
+\unexpanded\def\definepositionframed
{\dodoubleargument\dodefinepositionframed}
\def\dodefinepositionframed[#1][#2]%