diff options
Diffstat (limited to 'macros/luatex/optex/base/graphics.opm')
-rw-r--r-- | macros/luatex/optex/base/graphics.opm | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/macros/luatex/optex/base/graphics.opm b/macros/luatex/optex/base/graphics.opm index be2cfdab7e..901dc4d352 100644 --- a/macros/luatex/optex/base/graphics.opm +++ b/macros/luatex/optex/base/graphics.opm @@ -17,8 +17,8 @@ \_def\_inspic{\_hbox\_bgroup\_isnextchar\_bgroup\_inspicB\_inspicA} \_def\_inspicA #1 {\_inspicB {#1}} \_def\_inspicB #1{% - \_pdfximage \_ifdim\_picwidth=0pt \_else width\_picwidth\_fi - \_ifdim\_picheight=0pt \_else height\_picheight\_fi + \_pdfximage \_ifdim\_picwidth=\_zo \_else width\_picwidth\_fi + \_ifdim\_picheight=\_zo \_else height\_picheight\_fi \_picparams {\_the\_picdir#1}% \_pdfrefximage\_pdflastximage\_egroup} @@ -48,8 +48,8 @@ \_def\makeatletter#1\makeatother{}% \_def\includegraphics[#1]#2{\_inkscanpage#1,page=,\_end \_inspic{#2}\_hss}% \_def\_inkscanpage#1page=#2,#3\_end{\_ifx,#2,\_else\_def\_picparams{page#2}\_fi}% - \_def\put(#1,#2)#3{\_nointerlineskip\_vbox to0pt{\_vss\_hbox to0pt{\_kern#1\_picwidth - \_pdfsave\_hbox to0pt{#3}\_pdfrestore\_hss}\_kern#2\_picwidth}}% + \_def\put(#1,#2)#3{\_nointerlineskip\_vbox to\_zo{\_vss\_hbox to\_zo{\_kern#1\_picwidth + \_pdfsave\_hbox to\_zo{#3}\_pdfrestore\_hss}\_kern#2\_picwidth}}% \_def\begin#1{\_csname _begin#1\_endcsname}% \_def\_beginpicture(#1,#2){\_vbox\_bgroup \_hbox to\_picwidth{}\_kern#2\_picwidth \_def\end##1{\_egroup}}% @@ -57,7 +57,7 @@ \_vtop{\_def\\{\_cr}\_tabiteml{}\_tabitemr{}\_table{#2}{#3}}}% \_def\color[#1]#2{\_scancolor #2,}% \_def\_scancolor#1,#2,#3,{\_pdfliteral{#1 #2 #3 rg}}% - \_def\makebox(#1)[#2]#3{\_hbox to0pt{\_csname _mbx:#2\_endcsname{#3}}}% + \_def\makebox(#1)[#2]#3{\_hbox to\_zo{\_csname _mbx:#2\_endcsname{#3}}}% \_sdef{_mbx:lb}#1{#1\_hss}\_sdef{_mbx:rb}#1{\_hss#1}\_sdef{_mbx:b}#1{\_hss#1\_hss}% \_sdef{_mbx:lt}#1{#1\_hss}\_sdef{_mbx:rt}#1{\_hss#1}\_sdef{_mbx:t}#1{\_hss#1\_hss}% \_def\rotatebox#1#2{\_pdfrotate{#1}#2}% @@ -114,8 +114,8 @@ \_dimendef\_newHt 13 \_dimendef\_newDp 14 % only in this group \_dimendef\_newLt 15 \_dimendef\_newRt 16 \_preptransform{#1}% - \_kern-\_newLt \_vrule height\_newHt depth\_newDp width0pt - \_setbox0=\_hbox{\_box0}\_ht0=0pt \_dp0=0pt + \_kern-\_newLt \_vrule height\_newHt depth\_newDp width\_zo + \_setbox0=\_hbox{\_box0}\_ht0=\_zo \_dp0=\_zo \_pdfsave#1\_rlap{\_box0}\_pdfrestore \_kern\_newRt}% } \_def\_preptransform #1{\_def\_currmatrix{1 0 0 1 }% @@ -139,7 +139,7 @@ \_fi \_fi } \_def\_rotboxA #1#2#3#4{\_hbox{\_setbox0=\_hbox{{#4}}#2% - \_vbox to\_wd0{#3\_wd0=0pt \_dp0=0pt \_ht0=0pt + \_vbox to\_wd0{#3\_wd0=\_zo \_dp0=\_zo \_ht0=\_zo \_pdfsave\_pdfrotate{#1}\_box0\_pdfrestore\vfil}% \_kern\_tmpdim }} @@ -168,18 +168,18 @@ } \_def\_puttext{\_ea\_ea\_ea\_puttextA\_scantwodimens} -\_def\_puttextA#1#2#3{\_setbox0=\_hbox{{#3}}\_dimen1=#1sp \_dimen2=#2sp \_puttextB} +\_def\_puttextA#1#2#3{{\_setbox0=\_hbox{{#3}}\_dimen1=#1sp \_dimen2=#2sp \_puttextB}} \_def\_puttextB{% \_ifvmode - \_ifdim\_prevdepth>0pt \_vskip-\_prevdepth \_relax \_fi + \_ifdim\_prevdepth>\_zo \_vskip-\_prevdepth \_relax \_fi \_nointerlineskip \_fi - \_wd0=0pt \_ht0=0pt \_dp0=0pt - \_vbox to0pt{\_kern-\_dimen2 \_hbox to0pt{\_kern\_dimen1 \_box0\_hss}\_vss}} + \_wd0=\_zo \_ht0=\_zo \_dp0=\_zo + \_vbox to\_zo{\_kern-\_dimen2 \_hbox to\_zo{\_kern\_dimen1 \_box0\_hss}\_vss}} \_def\_putpic{\_ea\_ea\_ea\_putpicA\_scantwodimens} \_def\_putpicA#1#2{\_dimen1=#1sp \_dimen2=#2sp \_ea\_ea\_ea\_putpicB\_scantwodimens} -\_def\_putpicB#1#2#3{\_setbox0=\_hbox{\_picwidth=#1sp \_picheight=#2sp \_inspic{#3}}\_puttextB} +\_def\_putpicB#1#2#3{{\_setbox0=\_hbox{\_picwidth=#1sp \_picheight=#2sp \_inspic{#3}}\_puttextB}} \_newbox\_bgbox \_def\_backgroundpic#1{% @@ -262,14 +262,14 @@ \_def\_inovalA{\_isnextchar\_colorstackpop\_inovalB\_inovalC} \_def\_inovalB#1{#1\_isnextchar\_colorstackpop\_inovalB\_inovalC} \_def\_inovalC{\_egroup % of \setbox0=\hbox\bgroup - \_ifdim\_vvkern=0pt \_else \_ht0=\_dimexpr\_ht0+\_vvkern \_relax - \_dp0=\_dimexpr\_dp0+\_vvkern \_relax \_fi - \_ifdim\_hhkern=0pt \_else \_wd0=\_dimexpr\_wd0+\_hhkern \_relax \_fi + \_ifdim\_vvkern=\_zo \_else \_ht0=\_dimexpr\_ht0+\_vvkern \_relax + \_dp0=\_dimexpr\_dp0+\_vvkern \_relax \_fi + \_ifdim\_hhkern=\_zo \_else \_wd0=\_dimexpr\_wd0+\_hhkern \_relax \_fi \_ifx\_overlapmarginsvalue N\_dimen0=\_roundness \_dimen1=\_roundness \_else \_dimen0=-\_hhkern \_dimen1=-\_vvkern \_fi \_setflcolors\_tmp \_hbox{\_kern\_dimen0 - \_vbox to0pt{\_kern\_dp0 + \_vbox to\_zo{\_kern\_dp0 \_ifx\_shadowvalue N\_else \_edef\_tmpb{{\_bp{\_wd0+\_lwidth}}{\_bp{\_ht0+\_dp0+\_lwidth}}{\_bp{\_roundness}}}% \_doshadow\_oval @@ -298,7 +298,7 @@ \_dimen3=\_dimexpr \_ht0+\_dp0 \_relax \_dimen2=\_ratiovalue\_dimen3 \_else \_dimen2=\_wd0 \_dimen3=\_expr{1/\_ratiovalue}\_dimen2 \_fi \_setflcolors\_tmp - \_ifx\_overlapmarginsvalue N\_dimen0=0pt \_dimen1=0pt + \_ifx\_overlapmarginsvalue N\_dimen0=\_zo \_dimen1=\_zo \_else \_dimen0=-\_hhkern \_dimen1=-\_vvkern \_fi \_hbox{\_kern\_dimen0 \_ifx\_shadowvalue N\_else @@ -307,7 +307,7 @@ \_fi \_pdfliteral{q \_bp{\_lwidth} w \_tmp \_mv{\_bp{.5\_wd0}}{\_bp{(\_ht0-\_dp0)/2}} {\_circle{\_bp{\_dimen2}}{\_bp{\_dimen3}} B} Q}% - \_ifdim\_dimen1=0pt \_else + \_ifdim\_dimen1=\_zo \_else \_ht0=\_dimexpr \_ht0+\_dimen1 \_relax \_dp0=\_dimexpr \_dp0+\_dimen1 \_relax \_fi \_box0 \_kern\_dimen0} @@ -392,7 +392,7 @@ \_def\_clipinpath#1#2#3#4{% #1=x-pos[bp], #2=y-pos[bp], #3=curve, #4=text \_hbox{\_setbox0=\_hbox{{#4}}% - \_tmpdim=\_wd0 \_wd0=0pt + \_tmpdim=\_wd0 \_wd0=\_zo \_pdfliteral{q \_mv{#1}{#2}{#3 W n}}% \_box0\_pdfliteral{Q}\_kern\_tmpdim }% @@ -440,5 +440,6 @@ the \^`\transformbox{<transformation>}{\copy\mypic}`. \_endinput +2020-12-21: \puttext: \box0 in goup, bugfix 2020-04-12: \_public \clipinoval \clipincircle ; added, bug fixed |