diff options
Diffstat (limited to 'tex/context/base/anch-pos.mkiv')
| -rw-r--r-- | tex/context/base/anch-pos.mkiv | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/tex/context/base/anch-pos.mkiv b/tex/context/base/anch-pos.mkiv index e454747da..ba668f6ac 100644 --- a/tex/context/base/anch-pos.mkiv +++ b/tex/context/base/anch-pos.mkiv @@ -35,7 +35,9 @@ % at some point (when we no longer share code) we will move to numbers % do that we have less garbage collection and hashing % -% the global table ptbs is equivalent to jobpositions.tobesaved +% the global table _plib_ is equivalent to job.positions +% the global table _ptbs_ is equivalent to job.positions.tobesaved +% the global table _pcol_ is equivalent to job.positions.collected % % btw, using a function is more efficient than passing longer code % snippets to ctxlua @@ -108,12 +110,12 @@ % are the next 6 still used? -\def\dolazysaveposition #1#2#3#4{\normalexpanded{\ctxlatelua{ptbs['#1']={#2,"#3","#4"}}}} -\def\dolazysavepositionwhd #1#2#3#4#5#6#7{\normalexpanded{\ctxlatelua{ptbs['#1']={#2,"#3","#4","#5","#6","#7"}}}} -\def\dolazysavepositionplus#1#2#3#4#5#6#7#8{\normalexpanded{\ctxlatelua{ptbs['#1']={#2,"#3","#4","#5","#6","#7","#8"}}}} -\def\dosaveposition #1#2#3#4{\normalexpanded{\ctxlua {ptbs['#1']={#2,"#3","#4"}}}} -\def\dosavepositionwhd #1#2#3#4#5#6#7{\normalexpanded{\ctxlua {ptbs['#1']={#2,"#3","#4","#5","#6","#7"}}}} -\def\dosavepositionplus #1#2#3#4#5#6#7#8{\normalexpanded{\ctxlua {ptbs['#1']={#2,"#3","#4","#5","#6","#7","#8"}}}} +\def\dolazysaveposition #1#2#3#4{\normalexpanded{\ctxlatelua{_ptbs_['#1']={#2,"#3","#4"}}}} +\def\dolazysavepositionwhd #1#2#3#4#5#6#7{\normalexpanded{\ctxlatelua{_ptbs_['#1']={#2,"#3","#4","#5","#6","#7"}}}} +\def\dolazysavepositionplus#1#2#3#4#5#6#7#8{\normalexpanded{\ctxlatelua{_ptbs_['#1']={#2,"#3","#4","#5","#6","#7","#8"}}}} +\def\dosaveposition #1#2#3#4{\normalexpanded{\ctxlua {_ptbs_['#1']={#2,"#3","#4"}}}} +\def\dosavepositionwhd #1#2#3#4#5#6#7{\normalexpanded{\ctxlua {_ptbs_['#1']={#2,"#3","#4","#5","#6","#7"}}}} +\def\dosavepositionplus #1#2#3#4#5#6#7#8{\normalexpanded{\ctxlua {_ptbs_['#1']={#2,"#3","#4","#5","#6","#7","#8"}}}} \def\lastsavedpositionx {\the\dimexpr\pdflastxpos\scaledpoint\relax} \def\lastsavedpositiony {\the\dimexpr\pdflastypos\scaledpoint\relax} @@ -121,17 +123,17 @@ \def\dosetposition#1% {\savecurrentposition - \normalexpanded{\ctxlatelua{ptbs['#1']={% + \normalexpanded{\ctxlatelua{_ptbs_['#1']={% \noexpand\realfolio,"\noexpand\lastsavedpositionx","\noexpand\lastsavedpositiony"}}}} \def\dosetpositionwhd#1#2#3#4% {\savecurrentposition - \normalexpanded{\ctxlatelua{ptbs['#1']={% + \normalexpanded{\ctxlatelua{_ptbs_['#1']={% \noexpand\realfolio,"\noexpand\lastsavedpositionx","\noexpand\lastsavedpositiony","#2","#3","#4"}}}} \def\dosetpositionplus#1#2#3#4#5% {\savecurrentposition - \normalexpanded{\ctxlatelua{ptbs['#1']={% + \normalexpanded{\ctxlatelua{_ptbs_['#1']={% \noexpand\realfolio,"\noexpand\lastsavedpositionx","\noexpand\lastsavedpositiony","#2","#3","#4","#5"}}}} \let\dosetpositionpapersize\gobbletwoarguments @@ -160,7 +162,7 @@ %D Sometimes we want to trick the position handler a bit: -\def\replacepospxywhd#1#2#3#4#5#6#7{\ctxlua{jobpositions.replace('#1',\number#2,"\the\dimexpr#3\relax","\the\dimexpr#4\relax","\the\dimexpr#5\relax","\the\dimexpr#6\relax","\the\dimexpr#7\relax")}} +\def\replacepospxywhd#1#2#3#4#5#6#7{\ctxlua{_plib_.replace('#1',\number#2,"\the\dimexpr#3\relax","\the\dimexpr#4\relax","\the\dimexpr#5\relax","\the\dimexpr#6\relax","\the\dimexpr#7\relax")}} %D For postprocessing purposes, we save the number of %D positions. @@ -205,18 +207,18 @@ % \the\dimexpr\noexpand\lastsavedpositionx\ifnum\positionanchormode=\plusone-\MPx\pageanchor\fi\relax % \the\dimexpr\noexpand\lastsavedpositiony\ifnum\positionanchormode=\plusone-\MPx\pageanchor\fi\relax -\def\MPp #1{\ctxlua{jobpositions.MPp("#1")}} -\def\MPx #1{\ctxlua{jobpositions.MPx("#1")}} -\def\MPy #1{\ctxlua{jobpositions.MPy("#1")}} -\def\MPw #1{\ctxlua{jobpositions.MPw("#1")}} -\def\MPh #1{\ctxlua{jobpositions.MPh("#1")}} -\def\MPd #1{\ctxlua{jobpositions.MPd("#1")}} -\def\MPxy #1{\ctxlua{jobpositions.MPxy("#1")}} -\def\MPll #1{\ctxlua{jobpositions.MPll("#1")}} -\def\MPlr #1{\ctxlua{jobpositions.MPlr("#1")}} -\def\MPur #1{\ctxlua{jobpositions.MPur("#1")}} -\def\MPul #1{\ctxlua{jobpositions.MPul("#1")}} -\def\MPpos#1{\ctxlua{jobpositions.MPpos("#1")}} +\def\MPp #1{\ctxlua{_plib_.MPp("#1")}} +\def\MPx #1{\ctxlua{_plib_.MPx("#1")}} +\def\MPy #1{\ctxlua{_plib_.MPy("#1")}} +\def\MPw #1{\ctxlua{_plib_.MPw("#1")}} +\def\MPh #1{\ctxlua{_plib_.MPh("#1")}} +\def\MPd #1{\ctxlua{_plib_.MPd("#1")}} +\def\MPxy #1{\ctxlua{_plib_.MPxy("#1")}} +\def\MPll #1{\ctxlua{_plib_.MPll("#1")}} +\def\MPlr #1{\ctxlua{_plib_.MPlr("#1")}} +\def\MPur #1{\ctxlua{_plib_.MPur("#1")}} +\def\MPul #1{\ctxlua{_plib_.MPul("#1")}} +\def\MPpos#1{\ctxlua{_plib_.MPpos("#1")}} %D \macros %D {MPplus, MPrest, MPv, MPvv} @@ -238,8 +240,8 @@ %D %D The extra parameters are not treated. -\def\MPplus#1#2#3{\ctxlua{jobpositions.MPplus("#1",#2,"#3")}} \let\MPv \MPplus -\def\MPrest #1#2{\ctxlua{jobpositions.MPrest("#1","#2")}} \let\MPvv\MPrest +\def\MPplus#1#2#3{\ctxlua{_plib_.MPplus("#1",#2,"#3")}} \let\MPv \MPplus +\def\MPrest #1#2{\ctxlua{_plib_.MPrest("#1","#2")}} \let\MPvv\MPrest %D \macros %D {MPanchor} @@ -400,7 +402,7 @@ %D %D Again, this is a global action. -\def\copyposition#1#2{\ctxlua{jobpositions.copy('#1','#2')}} +\def\copyposition#1#2{\ctxlua{_plib_.copy('#1','#2')}} %D The fact that handling positions is a two pass operation, is %D one of the reasons why we need to be able to test for @@ -410,7 +412,7 @@ %D \doifpositionelse {identifier} {found action} {not found action} %D \stoptyping -\def\doifpositionelse#1{\ctxlua{jobpositions.doifelse('#1')}} +\def\doifpositionelse#1{\ctxlua{_plib_.doifelse('#1')}} %D We have now arrived at a few macros that would make sense as %D support macros, but ended up in the core. |