diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-15 20:58:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-15 20:58:27 +0000 |
commit | 810d9b451473ebe8e27c3f691bf001e01864e6fb (patch) | |
tree | 5151b6e2e4cef114dd6f4154f2d602312c40f0cf /Master/texmf-dist/tex/generic/pgf | |
parent | bf5bd6f0c1fa2b7dac8b2b7b8d4b52bf6a1518f0 (diff) |
pgf (15jan23)
git-svn-id: svn://tug.org/texlive/trunk@65553 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf')
62 files changed, 745 insertions, 267 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex index c751bf905dd..b7e47f4ee38 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex @@ -12,8 +12,13 @@ \newif\ifpgf@draftmode \def\pgf@typeout{\immediate\write0} -\input pgfmath.code.tex -\input pgfint.code.tex +\ifdefined\pgfmathloaded\else + \input pgfmath.code.tex +\fi + +\ifdefined\pgfintloaded\else + \input pgfint.code.tex +\fi \input pgfcorepoints.code.tex \input pgfcorepathconstruct.code.tex @@ -27,12 +32,10 @@ \input pgfcorearrows.code.tex \input pgfcoreshade.code.tex \input pgfcoreimage.code.tex +\input pgfcoreexternal.code.tex \input pgfcorelayers.code.tex \input pgfcoretransparency.code.tex \input pgfcorepatterns.code.tex \input pgfcorerdf.code.tex -\pgfutil@ifundefined{pgf@texdist@protect}{% - \def\pgf@texdist@protect{}% -}{} \endinput diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex index 597561a0018..fd1c0c48db6 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex @@ -239,6 +239,4 @@ \pgfuseimage{pgflastimage}} -\input pgfcoreexternal.code.tex - \endinput diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex index 7f72030c42e..c2e438dfc46 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex @@ -181,7 +181,7 @@ \expandafter\gdef\csname pgf@pattern@upperright@#1\endcsname{#4}% \expandafter\gdef\csname pgf@pattern@tilesize@#1\endcsname{#5}% \expandafter\long\expandafter\gdef\csname pgf@pattern@code@#1\endcsname{#6}% - \expandafter\gdef\csname pgf@pattern@type@#1\endcsname{7}% + \expandafter\gdef\csname pgf@pattern@type@#1\endcsname{#7}% }{\pgferror{The pattern `#1' is already defined}}% } diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex index 6bdf7ae6399..75cb1b587d6 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex @@ -242,6 +242,8 @@ \let\addtolength=\pgf@addtolength% \let\selectfont=\pgf@selectfont% \nullfont\spaceskip0pt\xspaceskip0pt% + \tracinglostchars=% + \ifnum\tracinglostchars>2 2\else\tracinglostchars\fi \setbox\pgf@layerbox@main\hbox to0pt\bgroup% \begingroup% } diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransformations.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransformations.code.tex index 76803c0ec3b..be252065c13 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransformations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransformations.code.tex @@ -47,7 +47,7 @@ % #6 is a macro which will be filled with the y shift. % % Example: -% \pgfgettransform\aa\ab\ba\bb\shiftx\shifty +% \pgfgettransformentries\aa\ab\ba\bb\shiftx\shifty % % -> % @@ -343,7 +343,7 @@ % % Example: % -% \pgftansformreset +% \pgftransformresetnontranslations \def\pgftransformresetnontranslations{% \let\pgf@pt@aa\pgf@one@text% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.code.tex index f06c4d9d087..1a9173fddca 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.code.tex @@ -144,8 +144,8 @@ }, circuit symbol unit/.code=\pgfmathsetlength\tikzcircuitssizeunit{#1}, circuit symbol size/.style args={width #1 height #2}{ - minimum width=#1*\tikzcircuitssizeunit, - minimum height=#2*\tikzcircuitssizeunit + minimum width={(#1)*\tikzcircuitssizeunit}, + minimum height={(#2)*\tikzcircuitssizeunit} }, huge circuit symbols/.style={circuit symbol unit=10pt}, large circuit symbols/.style={circuit symbol unit=8pt}, diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.code.tex index 22fa311db44..04dae1e6b52 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.code.tex @@ -245,14 +245,14 @@ \tikz@lib@dv@handle@data@group@use{#1}{#2}}}}% \def\tikz@lib@dv@handle@data@group@def#1#2={% - \pgfkeys{/pgf/data/new group=#2}% + \pgfkeys{/pgf/data/new group={#2}}% \tikz@lib@dv@handle@data@group@extend{#1}{#2}+=% }% \def\tikz@lib@dv@handle@data@group@extend#1#2+={% \pgfutil@ifnextchar\bgroup{ \begingroup% - \pgfkeys{/pgf/data/store in group=#2}% + \pgfkeys{/pgf/data/store in group={#2}}% \pgf@dv@do@adddata{\pgfkeysvalueof{/pgf/data visualization/obj}.add data({{\begingroup\pgfkeys{/pgf/data/.cd,/pgf/every data/.try,#1}}})}% \afterassignment\tikz@lib@dv@parse@loop% \let\tikz@dummy=%get rid of \bgroup @@ -423,7 +423,7 @@ store/.code=,% ignore when/.code=,% ignore class/.store in=\tikz@dv@new@class, - before creation/.code=#1, + before creation/.code={#1}, after creation/.store in=\tikz@dv@new@after, arg1/.store in=\tikz@dv@arg@a, arg2/.store in=\tikz@dv@arg@b, @@ -507,7 +507,7 @@ arg3 from key=/tikz/data visualization/#1/scaling, arg4 from key=/tikz/data visualization/#1/function }, - #1/attribute/.initial=#1, + #1/attribute/.initial={#1}, #1/function/.initial=, #1/scaling/.initial=, #1/scaling/default/.initial=0 at 0 and 1 at 1, @@ -826,7 +826,7 @@ \def\tikz@lib@dv@special@at#1#2{% % Ok, calculate direction vector: \tikzpointandanchordirection{\pgfkeysvalueof{#1/scaling mapper}.set in to(min)}{\pgfkeysvalueof{#1/scaling mapper}.set in to(max)} - \tikzset{anchor/.expanded=#2} + \tikzset{anchor/.expanded={#2}} }% @@ -1380,7 +1380,6 @@ \tikzdatavisualizationset{major/.expanded={at={\tikz@lib@dv@ats}},minor/.expanded={at={\tikz@lib@dv@minor@ats}}}% \fi% }% -\newif\iftikz@lib@dv@continue \def\tikz@lib@dv@about@log#1{% @@ -1436,9 +1435,9 @@ \tikzset{ /tikz/data visualization/axis options/.cd, unit vector/.code=\tikz@scan@one@point\tikz@lib@dv@uv#1, - length/.style={\tikz@dv@axis/scaling=min at 0 and max at #1}, + length/.style={\tikz@dv@axis/scaling=min at 0 and max at {#1}}, unit length/.code={\tikz@dv@parse@unit@length{#1}}, - power unit length/.style={\tikz@dv@axis/scaling=1 at 0 and 10 at #1} + power unit length/.style={\tikz@dv@axis/scaling=1 at 0 and 10 at {#1}} }% \def\tikz@lib@dv@uv#1{% @@ -1454,7 +1453,7 @@ \fi% }% \def\tikz@dv@parse@unit@length@#1per#2units\pgf@stop{ - \pgfkeysalso{\tikz@dv@axis/scaling=0 at 0 and #2 at #1} + \pgfkeysalso{\tikz@dv@axis/scaling=0 at 0 and {#2} at {#1}} }% @@ -1467,7 +1466,7 @@ #1/.code={ \def\tikz@visualizer{#1}% \pgfkeys{/tikz/data visualization/visualizer options/.cd,##1} - \pgf@dv@do@adddata{\pgfkeysvalueof{/pgf/data visualization/obj}.add data(\pgfkeys{/data point/set=#1})}% + \pgf@dv@do@adddata{\pgfkeysvalueof{/pgf/data visualization/obj}.add data(\pgfkeys{/data point/set={#1}})}% }, /utils/exec={ \advance\tikzdvvisualizercounter by 1\relax @@ -1491,7 +1490,7 @@ /tikz/data visualization/visualizers/#1/label in legend options/.style={#3}, }, style sheet/.style={/data point/set/.style sheet={#1}}, - /pgf/data/set/.style={/data point/set=#1}, + /pgf/data/set/.style={/data point/set={#1}}, }% \tikzdatavisualizationset{ @@ -1521,7 +1520,7 @@ \def\tikz@do@visualizer#1#2{% \tikzdatavisualizationset{ - #2=#1 + #2={#1} } }% @@ -1568,7 +1567,7 @@ #2] \tikzdatavisualizationset{every data set label/.try} \path [ - /data point/set=#1,/utils/exec=\pgf@signalstyle.emit(), + /data point/set={#1},/utils/exec=\pgf@signalstyle.emit(), /tikz/data visualization/.cd,every label in data/.try] (label visualizer coordinate') -- (label visualizer coordinate) @@ -2038,7 +2037,7 @@ /tikz/.cd, every label/.try, /tikz/data visualization/legend entry options/.cd, - setup={/data point/set=#1}, + setup={/data point/set={#1}}, /tikz/data visualization/visualizers/#1/label in legend options/.try, #2, } @@ -2220,8 +2219,8 @@ % % visualizer options/.cd, - attribute 1/.style={/data point/\tikz@visualizer/attribute 1=#1}, - attribute 2/.style={/data point/\tikz@visualizer/attribute 2=#1}, + attribute 1/.style={/data point/\tikz@visualizer/attribute 1={#1}}, + attribute 2/.style={/data point/\tikz@visualizer/attribute 2={#1}}, }% @@ -2264,7 +2263,7 @@ \pgfdvdeclarestylesheet{vary thickness} { - default style/.style={line width={0.3pt+#1*0.2pt}} + default style/.style={line width={0.3pt+(#1)*0.2pt}} }% \pgfdvdeclarestylesheet{vary dashing} diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex index ce7db967e61..20a17358073 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex @@ -1195,8 +1195,8 @@ }% \def\tikzlibignorecomparisonsINTERNAL{% \pgfkeys{/handlers/first char syntax=true} - \pgfkeyssetvalue{/handlers/first char syntax/the character >}{\pgfutil@gobble}% - \pgfkeyssetvalue{/handlers/first char syntax/the character <}{\pgfutil@gobble}% + \pgfkeyssetvalue{/handlers/first char syntax/\expandafter\meaning\string>}{\pgfutil@gobble}% + \pgfkeyssetvalue{/handlers/first char syntax/\expandafter\meaning\string<}{\pgfutil@gobble}% }% \def\tikz@lib@layout@node@options@prefix{graphs/.cd,}% @@ -1208,7 +1208,7 @@ % % Handle late options and operators \tikzgraphsset{source,target,.unknown/.code=,#1}% - \tikzgdlatenodeoptionacallback{\tikz@lib@graph@name}% + \tikzgdlatenodeoptionacallback{\tikz@pp@name\tikz@lib@graph@name}% \node also[graphs/redirect unknown to tikz,/tikz/graphs/.cd,#1](\tikz@lib@graph@name);% \pgfkeysvalueof{/tikz/graphs/@operators}% }% @@ -1222,8 +1222,8 @@ \def\tikz@lib@activate@source@target@edge@syntax{% \pgfkeys{/handlers/first char syntax=true} - \pgfkeyssetvalue{/handlers/first char syntax/the character >}{\tikz@lg@parse@more}% - \pgfkeyssetvalue{/handlers/first char syntax/the character <}{\tikz@lg@parse@less}% + \pgfkeyssetvalue{/handlers/first char syntax/\expandafter\meaning\string>}{\tikz@lg@parse@more}% + \pgfkeyssetvalue{/handlers/first char syntax/\expandafter\meaning\string<}{\tikz@lg@parse@less}% }% \def\tikz@lg@parse@less#1{\tikz@lg@parse@less@#1\pgf@stop}% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex index fd880c3df9e..2ff5aa2d386 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzexternalshared.code.tex @@ -121,7 +121,7 @@ \pgfqkeys{/tikz/external}{ figure list/.is if=tikzexternal@genfigurelist, - aux in dpth/.style={/pgf/images/aux in dpth=#1},% + aux in dpth/.style={/pgf/images/aux in dpth={#1}},% disable dependency files/.code={% \let\tikzexternalfiledependsonfile@ACTIVE=\tikzexternalfiledependsonfile }, @@ -510,8 +510,7 @@ % can be used to (temporarily) disable the externalization. \def\tikzexternaldisable{% - \let\tikz=\tikzexternal@origtikz - \tikzexternal@TEXDIALECT@restore@picture + \tikzexternaldisable@nofading \pgfutil@ifundefined{tikzexternal@orig@tikzfadingfrompicture} {}% NOP {% @@ -519,12 +518,16 @@ \let\endtikzfadingfrompicture=\tikzexternal@orig@endtikzfadingfrompicture \let\tikzfading=\tikzexternal@orig@tikzfading }% +}% +\def\tikzexternaldisable@nofading{% + \let\tikz=\tikzexternal@origtikz + \tikzexternal@TEXDIALECT@restore@picture \iftikzexternal@optimize \ifpgf@external@grabshipout \tikzexternal@optimize@RESTORE \fi \fi -}% +} % re-enables externalization after a \tikzexternalizedisable. \def\tikzexternalenable{% \if\tikzexternalize@hasbeencalled1% @@ -541,14 +544,14 @@ }{}% \def\tikzfadingfrompicture{% \begingroup - \tikzexternaldisable + \tikzexternaldisable@nofading \tikzexternal@orig@tikzfadingfrompicture}% \def\endtikzfadingfrompicture{% \tikzexternal@orig@endtikzfadingfrompicture \endgroup}% \def\tikzfading[##1]{% \begingroup - \tikzexternaldisable + \tikzexternaldisable@nofading \tikzexternal@orig@tikzfading[##1]% \endgroup}% }% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryangles.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryangles.code.tex index 2bd7e428a62..2d6abbd2e9e 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryangles.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryangles.code.tex @@ -14,11 +14,13 @@ \tikzset{ pics/angle/.style = { setup code = \tikz@lib@angle@parse#1\pgf@stop, + code = {}, background code = \tikz@lib@angle@background#1\pgf@stop, foreground code = \tikz@lib@angle@foreground#1\pgf@stop, }, pics/right angle/.style = { setup code = \tikz@lib@angle@parse#1\pgf@stop, + code = {}, background code = \tikz@lib@rightangle@background#1\pgf@stop, foreground code = \tikz@lib@rightangle@foreground#1\pgf@stop, }, diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryanimations.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryanimations.code.tex index 4682a0df06c..7b3fc12bf10 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryanimations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryanimations.code.tex @@ -47,7 +47,7 @@ \tikzanimateset{ .code={ \pgfkeys{/handlers/first char syntax=true} - \pgfkeyssetvalue{/handlers/first char syntax/the character "}{\tikz@animation@value}% + \pgfkeyssetvalue{/handlers/first char syntax/\expandafter\meaning\string"}{\tikz@animation@value}% \def\tikz@anim@t{0}% \def\tikz@anim@t@base{0}% \def\tikz@anim@t@current{0}% @@ -192,7 +192,7 @@ }% \def\tikz@animation@value@rest@base base{% - \tikz@anim@sync@scope{}{/utils/exec=\let\tikz@animation@time\tikz@anim@base@text\expandafter\tikz@anim@add\expandafter{\expandafter\tikz@anim@value\expandafter{\tikz@animation@value@head}}}{\tikz@anim@make@entry}% + \tikz@anim@sync@scope{}{\let\tikz@animation@time\tikz@anim@base@text\expandafter\tikz@anim@add\expandafter{\expandafter\tikz@anim@value\expandafter{\tikz@animation@value@head}}}{\tikz@anim@make@entry}% \pgfutil@ifnextchar\pgf@stop{\tikz@animation@value@rest=}{\tikz@animation@value@rest}% }% @@ -489,8 +489,8 @@ origin/.code=\tikz@anim@parse@origin{#1}, transform/.code=\tikz@anim@add{\pgfanimationset{transform={\let\tikz@transform\relax\tikzset{#1}}}}, along/.code=\tikz@anim@handle@along#1\pgf@stop, - entry control/.code=\tikz@anim@add{\pgfanimationset{entry control=#1}}, - exit control/.code=\tikz@anim@add{\pgfanimationset{exit control=#1}}, + entry control/.code=\tikz@anim@add{\pgfanimationset{entry control={#1}}}, + exit control/.code=\tikz@anim@add{\pgfanimationset{exit control={#1}}}, stay/.code=\tikz@anim@add{\pgfanimationset{stay}}, jump/.code=\tikz@anim@add{\pgfanimationset{jump}}, ease/.style={ diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarychains.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarychains.code.tex index 4708c329646..1d85b27c45f 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarychains.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarychains.code.tex @@ -145,10 +145,10 @@ \xdef\tikzchaincurrent{#1-\the\c@pgf@counta}% \expandafter\xdef\csname tikz@lib@chain@count@#1\endcsname{\the\c@pgf@counta}% \ifnum\c@pgf@counta=1\relax% - \tikzset{alias/.expanded=#1-begin} % Define pseudostart + \tikzset{alias/.expanded={#1-begin}} % Define pseudostart \fi% - \tikzset{alias/.expanded=#1-end} % Define pseudostart - \tikzset{alias/.expanded=#1-\the\c@pgf@counta} % Define pseudostart + \tikzset{alias/.expanded={#1-end}} % Define pseudostart + \tikzset{alias/.expanded={#1-\the\c@pgf@counta}} % Define pseudostart \tikz@lib@chain@direction% \tikzset{every on chain/.try}% }% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.code.tex index e9967c80857..bfe8863efc3 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.code.tex @@ -17,8 +17,10 @@ /pgf/decoration/.unknown/.code=% \pgfifdecoration{\pgfkeyscurrentname}{\edef\tikz@decoration@name{\pgfkeyscurrentname}} {\pgfifmetadecoration{\pgfkeyscurrentname}{\edef\tikz@decoration@name{\pgfkeyscurrentname}} + % Fully expand `\pgfkeyscurrentname' before being used in first-arg of + % `/errors/unknown key'. {\pgfkeys{/errors/unknown - key={/pgf/decoration/\pgfkeyscurrentname}{#1}}}},% + key/.expanded={/pgf/decoration/\pgfkeyscurrentname}{\pgfutil@unexpanded{#1}}}}},% /pgf/decoration/raise/.code={\def\tikz@dec@shift{\pgftransformyshift{#1}}\tikz@dec@trans}, /pgf/decoration/mirror/.code={% \csname if#1\endcsname diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfit.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfit.code.tex index 7de158df40c..b104a519c3c 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfit.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfit.code.tex @@ -9,8 +9,12 @@ \ProvidesFileRCS{tikzlibraryfit.code.tex} -\pgfkeys{/tikz/fit/.code=\tikz@lib@fit{#1}, - /tikz/rotate fit/.code=\def\tikz@lib@fit@rotate{#1}\pgfkeysalso{/tikz/rotate=#1} +\pgfqkeys{/tikz}{% + fit/.code=\tikz@lib@fit{#1}, + rotate fit/.code={% + \pgfmathsetmacro\tikz@lib@fit@rotate{#1}% + \pgfkeysalso{/tikz/rotate=\tikz@lib@fit@rotate}% + }, }% \def\tikz@lib@fit@rotate{0}% @@ -21,8 +25,6 @@ \pgf@yb=-16000pt\relax% \pgf@ya=16000pt\relax% % - \pgfmathsetmacro\tikz@lib@fit@rotate{\tikz@lib@fit@rotate}% - % % Now iterate over the coordinates \tikz@lib@fit@scan#1\pgf@stop% % Now, let's see what has happened diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfolding.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfolding.code.tex index 065ddd4bbbd..4974fffa504 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfolding.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfolding.code.tex @@ -56,6 +56,78 @@ \endscope }% +\def\tikz@lib@fold@squarerhombusr#1#2#3#4#5{% right leaning "square-of-two" rhombus + \scope[xshift=.63\tikz@lib@fold@length,yshift=.4755\tikz@lib@fold@length,xslant=0.34] + #1 + \endscope + \scope[shift={(70.529:\tikz@lib@fold@length)}] + #2 + \endscope + \scope[shift={(35.264:1.63299\tikz@lib@fold@length)},rotate=-109.471] + #3 + \endscope + \scope[xshift=\tikz@lib@fold@length,rotate=180] + #4 + \endscope + \scope[rotate=70.529] + #5 + \endscope +}% + +\def\tikz@lib@fold@squarerhombusl#1#2#3#4#5{% left leaning "square-of-two" rhombus + \scope[xshift=.33\tikz@lib@fold@length,yshift=.4755\tikz@lib@fold@length,xslant=-0.34] + #1 + \endscope + \scope[shift={(109.471:\tikz@lib@fold@length)}] + #2 + \endscope + \scope[shift={(54.736:1.1547\tikz@lib@fold@length)},rotate=-70.529] + #3 + \endscope + \scope[xshift=\tikz@lib@fold@length,rotate=180] + #4 + \endscope + \scope[rotate=109.471] + #5 + \endscope +}% + +\def\tikz@lib@fold@goldenrhombusr#1#2#3#4#5{% right leaning golden rhombus + \scope[xshift=.724\tikz@lib@fold@length,yshift=.447\tikz@lib@fold@length, xslant=0.447] + #1 + \endscope + \scope[shift={(63.435:\tikz@lib@fold@length)}] + #2 + \endscope + \scope[shift={(31.717:1.701\tikz@lib@fold@length)},rotate=-116.565] + #3 + \endscope + \scope[xshift=\tikz@lib@fold@length,rotate=180] + #4 + \endscope + \scope[rotate=63.435] + #5 + \endscope +}% + +\def\tikz@lib@fold@goldenrhombusl#1#2#3#4#5{% left leaning golden rhombus + \scope[xshift=.276\tikz@lib@fold@length,yshift=.447\tikz@lib@fold@length, xslant=-0.447] + #1 + \endscope + \scope[shift={(116.565:\tikz@lib@fold@length)}] + #2 + \endscope + \scope[shift={(58.283:1.051\tikz@lib@fold@length)},rotate=-63.435] + #3 + \endscope + \scope[xshift=\tikz@lib@fold@length,rotate=180] + #4 + \endscope + \scope[rotate=116.565] + #5 + \endscope +}% + \def\tikz@lib@fold@pentagon#1#2#3#4#5#6{% \scope[xshift=.5\tikz@lib@fold@length,yshift=0.68819\tikz@lib@fold@length] #1 @@ -533,6 +605,8 @@ pics/octahedron truncated folding/.style = {code=\tikzfoldingtruncatedoctahedron[];}, pics/dodecahedron folding/.style = {code=\tikzfoldingdodecahedron[];}, pics/dodecahedron' folding/.style = {code=\tikzfoldingalternatedodecahedron[];}, + pics/dodecahedron rhombic folding/.style = {code=\tikzfoldingrhombicdodecahedron[];}, + pics/dodecahedron golden folding/.style = {code=\tikzfoldinggoldenrhombicdodecahedron[];}, pics/cuboctahedron folding/.style = {code=\tikzfoldingcuboctahedron[];}, pics/cuboctahedron truncated folding/.style = {code=\tikzfoldingtruncatedcuboctahedron[];}, pics/icosahedron folding/.style = {code=\tikzfoldingicosahedron[];}, @@ -2076,3 +2150,295 @@ } \endgroup }% + +%rhombic (Catalan) dodecahedron ("type 1" - spheric) +\def\tikzfoldingrhombicdodecahedron#1[#2]#3;{% + \begingroup% + \tikzset{#2}% + \tikz@lib@fold@squarerhombusr{\tikz@lib@fold@face@B} + {\tikz@lib@fold@squarerhombusl{\scope[rotate=90]\tikz@lib@fold@face@C\endscope} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@squarerhombusr{\tikz@lib@fold@face@E} + {\tikz@lib@fold@squarerhombusl{\scope[rotate=90]\tikz@lib@fold@face@F\endscope} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@squarerhombusr{\scope[rotate=180]\tikz@lib@fold@face@D\endscope} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + } + } + {\tikz@lib@fold@squarerhombusl{\scope[rotate=-90]\tikz@lib@fold@face@H\endscope} + {\tikz@lib@fold@squarerhombusr{\scope[rotate=180]\tikz@lib@fold@face@G\endscope} + {\tikz@lib@fold@squarerhombusl{\scope[rotate=-90]\tikz@lib@fold@face@L\endscope} + {\tikz@lib@fold@squarerhombusr{\scope[rotate=180]\tikz@lib@fold@face@K\endscope} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@squarerhombusl{\scope[rotate=90]\tikz@lib@fold@face@J\endscope} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@squarerhombusl{\tikz@lib@fold@face@H} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@squarerhombusr{\tikz@lib@fold@face@F} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + } + \endgroup +}% + +%golden rhombic dodecahedron ("type 2" - flattened) +\def\tikzfoldinggoldenrhombicdodecahedron#1[#2]#3;{% + \begingroup% + \tikzset{#2}% + \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@A} + {\tikz@lib@fold@goldenrhombusl{\scope[rotate=180]\tikz@lib@fold@face@B\endscope} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + } + {\tikz@lib@fold@goldenrhombusr{\scope[rotate=180]\tikz@lib@fold@face@E\endscope} + {\tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@H} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@G} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + } + } + {\tikz@lib@fold@goldenrhombusl{\scope[rotate=180]\tikz@lib@fold@face@D\endscope} + {\tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@I} + {\tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@L} + {\tikz@lib@fold@goldenrhombusr{\scope[rotate=180]\tikz@lib@fold@face@K\endscope} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@goldenrhombusl{\scope[rotate=180]\tikz@lib@fold@face@J\endscope} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + } + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@F} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + } + {\tikz@lib@fold@goldenrhombusr{\scope[rotate=180]\tikz@lib@fold@face@C\endscope} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + } + \endgroup +}% + +%rhombic tricontahedron + +\def\tikzfoldingrhombictricontahedron#1[#2]#3;{% + \begingroup% + \tikzset{#2}% + \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@A} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@B} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@F} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@I} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@J} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@K} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + } + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@H} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + } + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@G} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@L} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@N} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@M} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + } + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + } + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@C} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@N} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@N} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@N} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@N} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + } + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@D} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@D} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@D} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@D} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@D} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + } + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@D} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@E} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@E} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@E} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@E} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@E} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + } + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@cut@path} + } + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@E} + { \tikz@lib@fold@goldenrhombusl{\tikz@lib@fold@face@E} + { \tikz@lib@fold@goldenrhombusr{\tikz@lib@fold@face@E} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@ear@path} + } + {\tikz@lib@fold@ear@path} + {\tikz@lib@fold@path} + {\tikz@lib@fold@path} + } + } + \endgroup +}% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymath.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymath.code.tex index 4683c71cd3f..ec00bc4b8a8 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymath.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymath.code.tex @@ -244,7 +244,6 @@ \def\tikz@math@process@keyword@length{\tikz@math@collecttosemicolon{\tikz@math@process@keyword@@length}}% \def\tikz@math@process@keyword@@length{% \def\tikz@math@assign@register{\csname newdimen\endcsname}% -\show\tikz@math@collected \expandafter\tikz@math@gobblespaces\expandafter\tikz@math@process@registers\tikz@math@collected,@,}% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymatrix.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymatrix.code.tex index 507ac7a40d8..51181893762 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymatrix.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymatrix.code.tex @@ -125,7 +125,7 @@ \def\tikz@delimiter#1#2#3#4#5#6#7#8{% \bgroup - \pgfextra{\let\tikz@save@last@fig@name=\tikz@last@fig@name}% + \pgfextra{\let\tikz@save@last@fig@name=\tikz@last@fig@name\tikz@node@is@a@labelfalse}% node[outer sep=0pt,inner sep=0pt,draw=none,fill=none,anchor=#1,at=(\tikz@last@fig@name.#2),#3] {% {\nullfont\pgf@process{\pgfpointdiff{\pgfpointanchor{\tikz@last@fig@name}{#4}}{\pgfpointanchor{\tikz@last@fig@name}{#5}}}}% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryperspective.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryperspective.code.tex index 61a8016057c..f9651ea9734 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryperspective.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryperspective.code.tex @@ -88,21 +88,21 @@ } \tikzset{ - 3d view/.code 2 args={ + 3d view/.code 2 args={% % Set elevation and azimuth angles - \pgfmathsetmacro\pgf@view@az{#1} - \pgfmathsetmacro\pgf@view@el{#2} + \pgfmathsetmacro\pgf@view@az{#1}% + \pgfmathsetmacro\pgf@view@el{#2}% % Calculate projections of rotation matrix - \pgfmathsetmacro\pgf@xvec@x{cos(\pgf@view@az)} - \pgfmathsetmacro\pgf@xvec@y{-sin(\pgf@view@az)*sin(\pgf@view@el)} - \pgfmathsetmacro\pgf@yvec@x{sin(\pgf@view@az)} - \pgfmathsetmacro\pgf@yvec@y{cos(\pgf@view@az)*sin(\pgf@view@el)} - \pgfmathsetmacro\pgf@zvec@x{+0} - \pgfmathsetmacro\pgf@zvec@y{cos(\pgf@view@el)} + \pgfmathsetmacro\pgf@xvec@x{cos(\pgf@view@az)}% + \pgfmathsetmacro\pgf@xvec@y{-sin(\pgf@view@az)*sin(\pgf@view@el)}% + \pgfmathsetmacro\pgf@yvec@x{sin(\pgf@view@az)}% + \pgfmathsetmacro\pgf@yvec@y{cos(\pgf@view@az)*sin(\pgf@view@el)}% + \pgfmathsetmacro\pgf@zvec@x{+0}% + \pgfmathsetmacro\pgf@zvec@y{cos(\pgf@view@el)}% % Set base vectors - \pgfsetxvec{\pgfpoint{\pgf@xvec@x cm}{\pgf@xvec@y cm}} - \pgfsetyvec{\pgfpoint{\pgf@yvec@x cm}{\pgf@yvec@y cm}} - \pgfsetzvec{\pgfpoint{\pgf@zvec@x cm}{\pgf@zvec@y cm}} + \pgfsetxvec{\pgfpoint{\pgf@xvec@x cm}{\pgf@xvec@y cm}}% + \pgfsetyvec{\pgfpoint{\pgf@yvec@x cm}{\pgf@yvec@y cm}}% + \pgfsetzvec{\pgfpoint{\pgf@zvec@x cm}{\pgf@zvec@y cm}}% }, 3d view/.default={-30}{15}, isometric view/.style={3d view={-45}{atan(1/sqrt(2))}}, diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryquotes.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryquotes.code.tex index bbd109bcb44..41ce3faaf5b 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryquotes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryquotes.code.tex @@ -38,15 +38,15 @@ \pgfkeys{/handlers/first char syntax=true}% \def\tikz@enable@node@quotes{% - \pgfkeyssetvalue{/handlers/first char syntax/the character "}{\tikz@quote@parser}% + \pgfkeyssetvalue{/handlers/first char syntax/\expandafter\meaning\string"}{\tikz@quote@parser}% \let\tikz@quotes@as\tikz@node@quotes@as% }% \def\tikz@enable@edge@quotes{% - \pgfkeyssetvalue{/handlers/first char syntax/the character "}{\tikz@quote@parser}% + \pgfkeyssetvalue{/handlers/first char syntax/\expandafter\meaning\string"}{\tikz@quote@parser}% \let\tikz@quotes@as\tikz@edge@quotes@as% }% \def\tikz@enable@pic@quotes{% - \pgfkeyssetvalue{/handlers/first char syntax/the character "}{\tikz@quote@parser}% + \pgfkeyssetvalue{/handlers/first char syntax/\expandafter\meaning\string"}{\tikz@quote@parser}% \let\tikz@quotes@as\tikz@pic@quotes@as% }% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.multipart.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.multipart.code.tex index e9d5e2fa84b..91183aaf780 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.multipart.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.multipart.code.tex @@ -12,12 +12,12 @@ \usepgflibrary{shapes.multipart}% \pgfkeys{/tikz/rectangle split/parts/.code={% - \pgfkeys{/pgf/rectangle split parts=#1}% + \pgfkeys{/pgf/rectangle split parts={#1}}% }% }% \pgfkeys{/tikz/rectangle split use custom fill/.code={% - \pgfkeys{/pgf/rectangle split use custom fill=#1}% + \pgfkeys{/pgf/rectangle split use custom fill={#1}}% \pgfkeys{/tikz/fill=none}}% }% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryspy.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryspy.code.tex index 7f3a63b045f..a5fea2a79bf 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryspy.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryspy.code.tex @@ -38,9 +38,9 @@ \let\tikz@lib@spy@collection=\pgfutil@empty% \tikzset{spy scope/.style={ - size/.style={minimum size=##1}, - height/.style={minimum height=##1}, - width/.style={minimum width=##1}, + size/.style={minimum size={##1}}, + height/.style={minimum height={##1}}, + width/.style={minimum width={##1}}, execute at begin scope={% \let\tikz@lib@spy@save=\tikz@lib@spy@collection% \setbox\tikz@lib@spybox=\hbox\bgroup\bgroup% @@ -58,7 +58,7 @@ }, lens/.store in=\tikz@lib@spy@lens, lens=, - magnification/.style={lens={scale=#1}}, + magnification/.style={lens={scale={#1}}}, spy connection path/.store in=\tikz@lib@spy@path, spy connection path= }% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryturtle.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryturtle.code.tex index 58fd46b40c2..889806f8d51 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryturtle.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryturtle.code.tex @@ -37,7 +37,7 @@ % given, by turtle distance \tikzset{ turtle/back/.default=\pgfkeysvalueof{/tikz/turtle/distance}, - turtle/back/.style={turtle forward=-#1} + turtle/back/.style={turtle forward={-(#1)}} }% @@ -71,13 +71,13 @@ % Shortcuts: \tikzset{turtle/.cd, - fd/.style={forward=#1}, + fd/.style={forward={#1}}, fd/.default=\pgfkeysvalueof{/tikz/turtle/distance}, - bk/.style={back=#1}, + bk/.style={back={#1}}, bk/.default=\pgfkeysvalueof{/tikz/turtle/distance}, - lt/.style={left=#1}, + lt/.style={left={#1}}, lt/.default=90, - rt/.style={right=#1}, + rt/.style={right={#1}}, rt/.default=90}% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex index d5244e9e853..9b76858b3af 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex @@ -153,32 +153,34 @@ \tikzset{ dash expand off/.code={% \ifcsname tikz@library@decorations@loaded\endcsname\else - \tikzerror{You need \string\usetikzlibrary{decorations} for ``dash offexpand''}% + \tikzerror{You need \string\usetikzlibrary{decorations} for ``dash expand off''}% \fi \tikz@addoption{% \pgfgetpath\currentpath \pgfprocessround{\currentpath}{\currentpath}% \pgf@decorate@parsesoftpath{\currentpath}{\currentpath}% + % All of \on, \off, \dashphase, \rest, and \onoff are unit-free. % Parse \on and \off from the current path - \edef\on{\expandafter\pgfutil@firstoftwo\tikz@dashpattern}% - \edef\off{\expandafter\pgfutil@secondoftwo\tikz@dashpattern}% + \pgfmathsetmacro\on{\expandafter\pgfutil@firstoftwo\tikz@dashpattern}% + \pgfmathsetmacro\off{\expandafter\pgfutil@secondoftwo\tikz@dashpattern}% % \dashphase = max(\on - \dashphase, 0) + \pgfmathsetmacro\tikz@dashphase{\tikz@dashphase}% \pgfmathsubtract@{\on}{\tikz@dashphase}% - \pgfmathmax@{\pgfmathresult}{0}% - \edef\dashphase{\the\dimexpr\pgfmathresult pt\relax}% - % \rest = \pgf@decorate@totalpathlength - \on - \edef\rest{\expandafter\pgf@sys@tonumber\dimexpr\pgf@decorate@totalpathlength - \on + 2\dimexpr\dashphase\relax\relax}% + \pgfmathmax@{\pgfmathresult,0}% + \let\dashphase=\pgfmathresult + % \rest = \pgf@decorate@totalpathlength - \on + 2\dashphase + \edef\rest{\pgf@sys@tonumber\dimexpr\pgf@decorate@totalpathlength - \on pt + 2\dimexpr\dashphase pt\relax\relax}% % \onoff = \on + \off - \edef\onoff{\expandafter\pgf@sys@tonumber\dimexpr\on+\off\relax}% + \edef\onoff{\pgf@sys@tonumber\dimexpr\on pt+\off pt\relax}% % \nfullonoff = max(floor(\rest/\onoff), 1) \pgfmathdivide@{\rest}{\onoff}% \pgfmathfloor@{\pgfmathresult}% - \pgfmathmax@{\pgfmathresult}{1}% + \pgfmathmax@{\pgfmathresult,1}% % \offexpand = max(\rest/\nfullonoff - \on, \off) \pgfmathdivide@{\rest}{\pgfmathresult}% \pgfmathsubtract@{\pgfmathresult}{\on}% - \pgfmathmax@{\pgfmathresult}{\off}% - \edef\tikz@marshal{\noexpand\pgfsetdash{{\on}{\pgfmathresult}}{\dashphase}}% + \pgfmathmax@{\pgfmathresult,\off}% + \edef\tikz@marshal{\noexpand\pgfsetdash{{+\on pt}{+\pgfmathresult pt}}{+\dashphase pt}}% \tikz@marshal }% } @@ -576,7 +578,7 @@ scope fading/.default=}% \tikzset{fit fading/.is if=tikz@fade@adjust}% \tikzset{fading transform/.store in=\tikz@fade@transform}% -\tikzset{fading angle/.style={fading transform={rotate=#1}}}% +\tikzset{fading angle/.style={fading transform={rotate={#1}}}}% \newif\iftikz@fade@adjust% \tikz@fade@adjusttrue% @@ -948,7 +950,8 @@ \tikzset{ name/.code={\edef\tikz@fig@name{\tikz@pp@name{#1}}\let\tikz@id@name\tikz@fig@name},% name prefix/.initial=,% - name suffix/.initial=% + name suffix/.initial=,% + local bounding box/.style={/pgf/local bounding box/.expanded=\tikz@pp@name{#1}} }% \def\tikz@pp@name#1{\csname pgfk@/tikz/name prefix\endcsname#1\csname pgfk@/tikz/name suffix\endcsname}% @@ -990,7 +993,6 @@ % Pic options -\newif\iftikz@node@is@pic \tikzset{pic text/.store in=\tikzpictext}% \let\tikzpictext\relax \tikzset{pic text options/.store in=\tikzpictextoptions}% @@ -1646,7 +1648,7 @@ % Setting keys % -\pgfkeys{/tikz/style/.style=#1}% +\pgfkeys{/tikz/style/.style={#1}}% \pgfkeys{/tikz/.unknown/.code=% % Is it a pgf key? @@ -2485,12 +2487,27 @@ \def\tikz@expand{% \advance\tikz@expandcount by -1 \ifnum\tikz@expandcount<0\relax% + \expandafter\pgfutil@firstoftwo + \else + \expandafter\pgfutil@secondoftwo + \fi + {% \tikzerror{Giving up on this path. Did you forget a semicolon?}% - \let\pgfutil@next=\tikz@finish% - \else% - \let\pgfutil@next=\tikz@@expand - \fi% - \pgfutil@next}% + % since the last token caused an error we should reinsert it and therefore save it + \global\let\tikz@expand@last@token=\pgf@let@token + \tikz@finish% + % + % To be combatible with `scopes` lib, which uses a redefined + % \tikz@lib@scope@check to check the next token, the reinsertion is done + % here, not at the end of (every) \tikz@finish. + % + \expandafter\let\expandafter\tikz@expand@last@token@\csname tikz@expand@last@token\endcsname + \global\let\tikz@expand@last@token=\relax + \tikz@expand@last@token@ + }{% + \tikz@@expand + }% +} \def\tikz@@expand{% \expandafter\tikz@scan@next@command\pgf@let@token}% @@ -5120,7 +5137,7 @@ \tikzset{cs/angle/.store in=\tikz@cs@angle}% \tikzset{cs/x radius/.store in=\tikz@cs@xradius}% \tikzset{cs/y radius/.store in=\tikz@cs@yradius}% -\tikzset{cs/radius/.style={/tikz/cs/x radius=#1,/tikz/cs/y radius=#1}}% +\tikzset{cs/radius/.style={/tikz/cs/x radius={#1},/tikz/cs/y radius={#1}}}% \tikzset{cs/name/.store in=\tikz@cs@node}% \tikzset{cs/anchor/.store in=\tikz@cs@anchor}% @@ -5460,18 +5477,18 @@ }% }% \def\tikz@parse@main@intersection#1#2of #3 and #4){% - \tikzset{cs/solution=#2}% + \tikzset{cs/solution={#2}}% \pgfutil@in@{--}{#3}% \ifpgfutil@in@% \tikz@reparse@line{first}#3\pgf@stop% \else% - \tikzset{cs/first node=#3}% + \tikzset{cs/first node={#3}}% \fi% \pgfutil@in@{--}{#4}% \ifpgfutil@in@% \tikz@reparse@line{second}#4\pgf@stop% \else% - \tikzset{cs/second node=#4}% + \tikzset{cs/second node={#4}}% \fi% \tikz@parse@cs@intersection()% advanced hackery... \edef\pgf@marshal{\noexpand#1{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}}% diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/trees/ChildSpec.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/trees/ChildSpec.lua index 815f90d268e..cc3c18d12c8 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/trees/ChildSpec.lua +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/trees/ChildSpec.lua @@ -137,7 +137,7 @@ declare { While all of this might sound a bit complicated, the application of the key in a binary tree is pretty straightforward: To indicate that a node is a ``right'' child in a tree, just add \texttt{desired child index=2} - to it. This will make it a second child, possibly causing the fist + to it. This will make it a second child, possibly causing the first child to be missing. If there are two nodes specified as children of a node, by saying \texttt{desired child index=}\meta{number} for one of them, you will cause it be first or second child, depending on diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/tikzlibrarygraphdrawing.code.tex b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/tikzlibrarygraphdrawing.code.tex index 32d1b1b7a09..aac7311e349 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/tikzlibrarygraphdrawing.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/tikzlibrarygraphdrawing.code.tex @@ -83,15 +83,20 @@ % % Setup for the graphs syntax % - /tikz/graphs/new ->/.code n args={4}{\pgfgdedge{##1}{##2}{->}{/tikz,##3}{##4}}, - /tikz/graphs/new <-/.code n args={4}{\pgfgdedge{##1}{##2}{<-}{/tikz,##3}{##4}}, - /tikz/graphs/new --/.code n args={4}{\pgfgdedge{##1}{##2}{--}{/tikz,##3}{##4}}, - /tikz/graphs/new <->/.code n args={4}{\pgfgdedge{##1}{##2}{<->}{/tikz,##3}{##4}}, - /tikz/graphs/new -!-/.code n args={4}{\pgfgdedge{##1}{##2}{-!-}{/tikz,##3}{##4}}, + /tikz/graphs/new ->/.code n args={4}{\tikz@lib@gd@edge{##1}{##2}{->}{/tikz,##3}{##4}}, + /tikz/graphs/new <-/.code n args={4}{\tikz@lib@gd@edge{##1}{##2}{<-}{/tikz,##3}{##4}}, + /tikz/graphs/new --/.code n args={4}{\tikz@lib@gd@edge{##1}{##2}{--}{/tikz,##3}{##4}}, + /tikz/graphs/new <->/.code n args={4}{\tikz@lib@gd@edge{##1}{##2}{<->}{/tikz,##3}{##4}}, + /tikz/graphs/new -!-/.code n args={4}{\tikz@lib@gd@edge{##1}{##2}{-!-}{/tikz,##3}{##4}}, /tikz/graphs/placement/compute position/.code=,% } }% +% wrapper for \pgfgdedge +\def\tikz@lib@gd@edge#1#2{% + \pgfgdedge{\tikz@pp@name{#1}}{\tikz@pp@name{#2}}% +} + \pgfgdaddprepareedgehook{ \tikz@enable@edge@quotes% \let\tikz@transform=\pgfutil@empty% @@ -130,11 +135,11 @@ }% \def\tikz@gd@edge@from@parent@macro#1#2{ - [/utils/exec=\pgfgdedge{\tikzparentnode}{\tikzchildnode}{--}{/tikz,#1}{#2}] + [/utils/exec=\tikz@lib@gd@edge{\tikzparentnode}{\tikzchildnode}{--}{/tikz,#1}{#2}] }% \def\tikz@gd@plain@edge@macro#1#2{ - \pgfgdedge{\tikztostart}{\tikztotarget}{--}{/tikz,#1}{#2} + \tikz@lib@gd@edge{\tikztostart}{\tikztotarget}{--}{/tikz,#1}{#2} }% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.shapes.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.shapes.code.tex index 2341ee2c554..77c366ca0c6 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.shapes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.shapes.code.tex @@ -25,24 +25,24 @@ shape scaled/.is if=pgfshapedecorationscaled, shape evenly spread/.store in=\pgf@lib@shapedecoration@spread, shape start size/.style={% - shape start width=#1, - shape start height=#1% + shape start width={#1}, + shape start height={#1}% },% shape end size/.style={% - shape end width=#1, - shape end height=#1% + shape end width={#1}, + shape end height={#1}% },% shape size/.style={% - shape start size=#1, - shape end size=#1% + shape start size={#1}, + shape end size={#1}% },% shape width/.style={% - shape start width=#1, - shape end width=#1 + shape start width={#1}, + shape end width={#1} }, shape height/.style={% - shape start height=#1, - shape end height=#1 + shape start height={#1}, + shape end height={#1} } }% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarylindenmayersystems.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarylindenmayersystems.code.tex index a458eb8e6ab..6fbdd86664b 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarylindenmayersystems.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarylindenmayersystems.code.tex @@ -26,7 +26,7 @@ },% left angle/.code={\pgfmathparse{#1}\let\pgflsystemleftangle=\pgfmathresult},% right angle/.code={\pgfmathparse{#1}\let\pgflsystemrightangle=\pgfmathresult},% - angle/.style={/pgf/lindenmayer system/left angle=#1, /pgf/lindenmayer system/right angle=#1},% + angle/.style={/pgf/lindenmayer system/left angle={#1}, /pgf/lindenmayer system/right angle={#1}},% randomize angle percent/.code={% \pgfmathparse{#1}% \let\pgflsystemrandomizeanglepercent=\pgfmathresult% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex index c9e6c141a51..0beb873c073 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex @@ -258,7 +258,7 @@ % backw. compat: the extra search path confuses the '.unknown' % handlers, so this here is deprecated: /pgf/text mark/style/.style={/pgf/text mark style={#1}},% - /pgf/text mark/as node/.style={/pgf/text mark as node=#1},% + /pgf/text mark/as node/.style={/pgf/text mark as node={#1}},% }% \pgfdeclareplotmark{text} diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.IEC.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.IEC.code.tex index 69f27e7d0d1..4022cd605d8 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.IEC.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.IEC.code.tex @@ -55,7 +55,13 @@ % % Adjust for the width of the gate symbol. % - \setbox\pgf@hbox\hbox{{\pgfkeysvalueof{/pgf/#1 gate IEC symbol}}}% add braces as color-aftergroup-fix TT + \setbox\pgf@hbox\hbox{% + % wrap in `\pgfinterruptpicture' to restore font, like how `\pgfnode` sets + % `\pgfnodeparttextbox` + \pgfinterruptpicture + {\pgfkeysvalueof{/pgf/#1 gate IEC symbol}}% add braces as color-aftergroup-fix TT + \endpgfinterruptpicture + }% \pgf@xa.5\wd\pgf@hbox% \pgf@ya.5\ht\pgf@hbox% \advance\pgf@ya.5\dp\pgf@hbox% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.arrows.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.arrows.code.tex index c2f06697c69..be8cb3740ca 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.arrows.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.arrows.code.tex @@ -1308,7 +1308,7 @@ \arrowboxpoints% \ifdim\eastextend>0pt\relax% \let\pgf@lib@shapes@arrowbox@referencepoint\midpoint% - \csname pgf@anchor@arrow box@border\endcsname{\pgfqpoint{\eastextend}{0pt}}; + \csname pgf@anchor@arrow box@border\endcsname{\pgfqpoint{\eastextend}{0pt}}% \else% \arrowboxcorner% \pgf@xa\pgf@x% @@ -1320,7 +1320,7 @@ \arrowboxpoints% \ifdim\westextend>0pt\relax% \let\pgf@lib@shapes@arrowbox@referencepoint\midpoint% - \csname pgf@anchor@arrow box@border\endcsname{\pgfqpoint{-\westextend}{0pt}}; + \csname pgf@anchor@arrow box@border\endcsname{\pgfqpoint{-\westextend}{0pt}}% \else% \arrowboxcorner% \pgf@xa\pgf@x% @@ -1333,7 +1333,7 @@ \arrowboxpoints% \ifdim\eastextend>0pt\relax% \let\pgf@lib@shapes@arrowbox@referencepoint\basepoint% - \csname pgf@anchor@arrow box@border\endcsname{\pgfqpoint{\eastextend}{0pt}}; + \csname pgf@anchor@arrow box@border\endcsname{\pgfqpoint{\eastextend}{0pt}}% \else% \arrowboxcorner% \pgf@xa\pgf@x% @@ -1345,7 +1345,7 @@ \arrowboxpoints% \ifdim\westextend>0pt\relax% \let\pgf@lib@shapes@arrowbox@referencepoint\basepoint% - \csname pgf@anchor@arrow box@border\endcsname{\pgfqpoint{-\westextend}{0pt}}; + \csname pgf@anchor@arrow box@border\endcsname{\pgfqpoint{-\westextend}{0pt}}% \else% \arrowboxcorner% \pgf@xa\pgf@x% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.geometric.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.geometric.code.tex index 8ed52a51871..71d03f9535f 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.geometric.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.geometric.code.tex @@ -212,7 +212,7 @@ aspect/.code={\pgfsetshapeaspect{#1}},% this for tikz... shape aspect/.initial=1,% but this is consistent with other pgfset stuff. shape aspect/.code={% - \pgfkeys{/pgf/aspect=#1}% + \pgfkeys{/pgf/aspect={#1}}% \pgfkeyssetvalue{/pgf/shape aspect}{#1} }% }% @@ -369,7 +369,7 @@ \pgfkeyslet{/pgf/star point ratio}{\pgf@lib@temp}% \pgf@lib@shapes@starouterradiususesratiotrue% },% - star rotate/.style={/pgf/shape border rotate=#1},% For compatibility with 1.18 + star rotate/.style={/pgf/shape border rotate={#1}},% For compatibility with 1.18 }% @@ -676,7 +676,7 @@ % \pgfkeys{/pgf/.cd, regular polygon sides/.initial=5, - regular polygon rotate/.style={/pgf/shape border rotate=#1}% For compatibility with 1.18 + regular polygon rotate/.style={/pgf/shape border rotate={#1}}% For compatibility with 1.18 }% @@ -931,8 +931,8 @@ trapezium left angle/.initial=60, trapezium right angle/.initial=60, trapezium angle/.style={ - /pgf/trapezium left angle=#1, - /pgf/trapezium right angle=#1 + /pgf/trapezium left angle={#1}, + /pgf/trapezium right angle={#1} },% trapezium stretches/.is if=pgf@lib@sh@trapeziumstretches,% trapezium stretches body/.is if=pgf@lib@sh@trapeziumstretchesbody,% @@ -2346,13 +2346,13 @@ \pgfutil@in@{and}{#1}% \ifpgfutil@in@% \def\pgf@marshal##1and##2\@@{% - \pgfkeys{/pgf/kite upper vertex angle=##1}% - \pgfkeys{/pgf/kite lower vertex angle=##2}% + \pgfkeys{/pgf/kite upper vertex angle={##1}}% + \pgfkeys{/pgf/kite lower vertex angle={##2}}% }% \expandafter\pgf@marshal#1\@@% \else% - \pgfkeys{/pgf/kite upper vertex angle=#1}% - \pgfkeys{/pgf/kite lower vertex angle=#1}% + \pgfkeys{/pgf/kite upper vertex angle={#1}}% + \pgfkeys{/pgf/kite lower vertex angle={#1}}% \fi% }% }% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.misc.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.misc.code.tex index 4096c3ded85..477a7b7caf0 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.misc.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.misc.code.tex @@ -77,8 +77,8 @@ \pgfkeys{/pgf/.cd, rounded rectangle west arc/.initial=convex, rounded rectangle east arc/.initial=convex, - rounded rectangle left arc/.style={/pgf/rounded rectangle west arc=#1},% - rounded rectangle right arc/.style={/pgf/rounded rectangle east arc=#1},% + rounded rectangle left arc/.style={/pgf/rounded rectangle west arc={#1}},% + rounded rectangle right arc/.style={/pgf/rounded rectangle east arc={#1}},% rounded rectangle arc length/.initial=180% }% @@ -549,7 +549,7 @@ chamfered rectangle ysep/.initial=.666ex% }% \pgfkeys{/pgf/chamfered rectangle sep/.style={% - /pgf/chamfered rectangle xsep=#1,/pgf/chamfered rectangle ysep=#1}% + /pgf/chamfered rectangle xsep={#1},/pgf/chamfered rectangle ysep={#1}}% }% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.symbols.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.symbols.code.tex index 7fcba414efb..b876db6fd1e 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.symbols.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.symbols.code.tex @@ -588,7 +588,7 @@ aspect/.code={\pgfsetshapeaspect{#1}},% this for tikz... shape aspect/.initial=1,% but this is consistent with other pgfset stuff. shape aspect/.code={% - \pgfkeys{/pgf/aspect=#1}% + \pgfkeys{/pgf/aspect={#1}}% \pgfkeyssetvalue{/pgf/shape aspect}{#1} }% }% @@ -2104,7 +2104,7 @@ \pgfkeys{/pgf/.cd, tape bend top/.initial=in and out, tape bend bottom/.initial=in and out, - tape bend/.style={/pgf/tape bend top=#1, /pgf/tape bend bottom=#1}, + tape bend/.style={/pgf/tape bend top={#1}, /pgf/tape bend bottom={#1}}, tape bend height/.initial=5pt, }% diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmath.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmath.code.tex index 7bfdf58a6c9..fd40a36d599 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmath.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmath.code.tex @@ -20,6 +20,17 @@ \input pgfkeys.code.tex \fi +\input pgfmathutil.code.tex +\input pgfmathparser.code.tex +\input pgfmathfunctions.code.tex +\input pgfmathfunctions.basic.code.tex +\input pgfmathfunctions.trigonometric.code.tex +\input pgfmathfunctions.random.code.tex +\input pgfmathfunctions.comparison.code.tex +\input pgfmathfunctions.base.code.tex +\input pgfmathfunctions.round.code.tex +\input pgfmathfunctions.misc.code.tex +\input pgfmathfunctions.integerarithmetics.code.tex \input pgfmathcalc.code.tex \input pgfmathfloat.code.tex diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathcalc.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathcalc.code.tex index bb4d1022e54..1e854864d8a 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathcalc.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathcalc.code.tex @@ -11,11 +11,6 @@ % % Version 1.414213 29/9/2007 -\input pgfmathutil.code.tex -\input pgfmathparser.code.tex -\input pgfmathfunctions.code.tex -%\input pgfmathbase.code.tex - % \pgfmathsetlength, \pgfmathaddtolength % % #1 = dimension register diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfloat.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfloat.code.tex index a3a36d82541..f133c6d4956 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfloat.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfloat.code.tex @@ -33,7 +33,7 @@ } -\global\newif\ifpgfmathfloatcomparison +\newif\ifpgfmathfloatcomparison \newif\ifpgfmathfloatroundhasperiod \newif\ifpgfmathprintnumberskipzeroperiod @@ -1010,7 +1010,7 @@ fixed zerofill/.default=true, sci zerofill/.is if= pgfmathfloat@usezerofill@sci, sci zerofill/.default=true, - zerofill/.style= {/pgf/number format/fixed zerofill=#1,/pgf/number format/sci zerofill=#1}, + zerofill/.style= {/pgf/number format/fixed zerofill={#1},/pgf/number format/sci zerofill={#1}}, zerofill/.default= true, precision/.store in= \pgfmathfloat@round@precision, sci precision/.code={% @@ -1637,12 +1637,7 @@ % variables in /pgf/number format). % % You may specify optional arguments with \pgfmathprintnumber[...]. -\def\pgfmathprintnumber{% - % \protect allows to supply \pgfmathprintnumber inside of latex - % captions. The \csname yields \relax in case protect is undefined. - \pgf@texdist@protect\pgfmathprintnumber@protected -}% -\def\pgfmathprintnumber@protected{% +\pgfutil@protected\def\pgfmathprintnumber{% \pgfutil@ifnextchar[% {\pgfmathprintnumber@OPT}% {\pgfmathprintnumber@noopt}% diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.code.tex index 417ede069dd..6e5d079c6b3 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.code.tex @@ -262,17 +262,6 @@ \pgfmathredeclarefunction{#1}{#2}% }% -\input pgfmathfunctions.basic.code.tex -\input pgfmathfunctions.trigonometric.code.tex -\input pgfmathfunctions.random.code.tex -\input pgfmathfunctions.comparison.code.tex -\input pgfmathfunctions.base.code.tex -\input pgfmathfunctions.round.code.tex -\input pgfmathfunctions.misc.code.tex -\input pgfmathfunctions.integerarithmetics.code.tex - - - % Local Variables: % tab-width: 2 % End: diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.random.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.random.code.tex index da20ce024f0..969762c6c9a 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.random.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.random.code.tex @@ -243,4 +243,4 @@ \pgfmath@ifundefined{pgfmath@randomlist@#2}{\pgfmath@error{Unknown random list `#2'}{}}{% \edef\pgfmath@randomlistlength{\csname pgfmath@randomlist@#2\endcsname}% \pgfmathrandominteger{\pgfmath@randomtemp}{1}{\pgfmath@randomlistlength}% - \def#1{\csname pgfmath@randomlist@#2@\pgfmath@randomtemp\endcsname}}} + \expandafter\def\expandafter#1\expandafter{\csname pgfmath@randomlist@#2@\pgfmath@randomtemp\endcsname}}} diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathparser.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathparser.code.tex index 439e62e4370..8a560ff114b 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathparser.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathparser.code.tex @@ -29,12 +29,16 @@ \fi \pgfmath@parse@next} -\def\pgfmath@catcodes{% Maybe unnecessary. - \catcode`\==12 % - \catcode`\,=12 % - \catcode`\|=12 % - \catcode`\&=12 % -} +\begingroup + \lccode`\~=`\" + \lowercase{\endgroup + \def\pgfmath@catcodes{% + \catcode`\==12 % + \catcode`\,=12 % + \catcode`\|=12 % + \catcode`\&=12 % + \let~\pgfmath@char@quote + }}% \def\pgfmathqparse{% \begingroup diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleanimations.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleanimations.code.tex index 5384b1a71b2..c0a83468112 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleanimations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleanimations.code.tex @@ -648,7 +648,7 @@ \def\pgf@anim@protocol@path@size{% - \pgfutil@ifnextchar\pgf@stop\relax\pgf@anim@protocol@path@size@% + \pgfutil@ifnextchar\pgf@stop\pgfutil@gobble\pgf@anim@protocol@path@size@% }% \def\pgf@anim@protocol@path@size@#1#2#3{% \pgf@protocolanimsizes@direct{#2}{#3}% diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledatavisualization.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledatavisualization.code.tex index f60764d0be3..96686aa73f3 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledatavisualization.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledatavisualization.code.tex @@ -721,6 +721,7 @@ \def\pgf@partext{\par}% \def\pgf@datagroup@readline{% + \endlinechar=-1 % suppress white space at end; this is local to `\pgfdata` \immediate\read\r@pgf@reada to \pgf@temp% \ifx\pgf@temp\pgf@partext% \pgf@dv@format@emptyline% diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledecorations.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledecorations.code.tex index f7cdd13457a..c119dd622f5 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledecorations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledecorations.code.tex @@ -56,7 +56,7 @@ aspect/.code={\pgfmathparse{#1}\let\pgfdecorationsegmentaspect\pgfmathresult}, start radius/.initial=2.5pt, end radius/.initial=2.5pt, - radius/.style={start radius=#1,end radius=#1}, + radius/.style={start radius={#1},end radius={#1}}, path has corners/.is if=pgfdecoratepathhascorners, reverse path/.is if=pgf@decorate@inputsegmentobjects@reverse, }% @@ -2180,11 +2180,11 @@ \def\pgfsnakesegmentaspect{\pgfdecorationsegmentaspect}% \pgfset{% - /pgf/segment amplitude/.style={/pgf/decoration={amplitude=#1,shape height=2*#1}}, - /pgf/segment length/.style={/pgf/decoration={segment length=#1}}, - /pgf/segment angle/.style={/pgf/decoration={angle=#1}}, - /pgf/segment aspect/.style={/pgf/decoration={aspect=#1}}, - /pgf/segment object length/.style={/pgf/decoration={shape width=#1,radius=#1}}}% + /pgf/segment amplitude/.style={/pgf/decoration={amplitude={#1},shape height={2*(#1)}}}, + /pgf/segment length/.style={/pgf/decoration={segment length={#1}}}, + /pgf/segment angle/.style={/pgf/decoration={angle={#1}}}, + /pgf/segment aspect/.style={/pgf/decoration={aspect={#1}}}, + /pgf/segment object length/.style={/pgf/decoration={shape width={#1},radius={#1}}}}% diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex index 01f6feee976..166eb470938 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex @@ -288,7 +288,7 @@ \def\pgf@matrix@addtolength#1#2{\edef\pgf@temp{#2}\expandafter\pgf@matrix@addtolength@\expandafter#1#2,\pgf@stop}% \def\pgf@matrix@addtolength@#1#2,#3\pgf@stop{% - \def\pgf@temp{#2}% + \pgfkeys@spdef\pgf@temp{#2}% \ifx\pgf@temp\pgfutil@empty% \else% \ifx\pgf@temp\pgf@matrix@fixed@text% diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex index efef54af7ad..6be10d1464d 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex @@ -887,13 +887,13 @@ \pgfset{ inner xsep/.initial =.3333em, inner ysep/.initial =.3333em, - inner sep/.style ={/pgf/inner xsep=#1,/pgf/inner ysep=#1}, + inner sep/.style ={/pgf/inner xsep={#1},/pgf/inner ysep={#1}}, outer xsep/.initial =.5\pgflinewidth, outer ysep/.initial =.5\pgflinewidth, outer sep/.code =\pgf@handle@outer@sep{#1}, minimum width/.initial =1pt, minimum height/.initial =1pt, - minimum size/.style ={/pgf/minimum width=#1,/pgf/minimum height=#1}, + minimum size/.style ={/pgf/minimum width={#1},/pgf/minimum height={#1}}, }% diff --git a/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex b/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex index 18d99091780..12b28e20457 100644 --- a/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex +++ b/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex @@ -1,15 +1,4 @@ -\begingroup -\catcode`\-=12 -\catcode`\/=12 -\catcode`\.=12 -\catcode`\:=12 -\catcode`\+=12 -\catcode`\-=12 -\gdef\pgfrevision{3.1.9a} -\gdef\pgfversion{3.1.9a} -\gdef\pgfversiondatetime{2021-05-15 12:06:55 +0200} -\gdef\pgfrevisiondatetime{2021-05-15 12:06:55 +0200} -\gdef\pgf@glob@TMPa#1-#2-#3 #4\relax{#1/#2/#3} -\xdef\pgfversiondate{\expandafter\pgf@glob@TMPa\pgfversiondatetime\relax} -\xdef\pgfrevisiondate{\expandafter\pgf@glob@TMPa\pgfrevisiondatetime\relax} -\endgroup +\def\pgfrevision{3.1.10} +\def\pgfversion{3.1.10} +\def\pgfrevisiondate{2023-01-15} +\def\pgfversiondate{2023-01-15} diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def index 765ffc84092..e1ad4e70216 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def @@ -89,7 +89,7 @@ \pgferror{Unknown blend mode '#1'}% \def\pgf@temp{Normal}% \fi% - \edef\pgf@temp{/pgf@bm\pgf@temp << /BM [ /\pgf@temp ] >>}%<< + \edef\pgf@temp{/pgf@bm\pgf@temp << /BM /\pgf@temp >>}%<< \expandafter\pgfutil@addpdfresource@extgs\expandafter{\pgf@temp}% \fi% \pgfsysprotocol@literal{\csname pgf@sys@pdf@bm@#1\endcsname\space gs}% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def index 2c0fc8ae559..7fc1a4e7ed9 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def @@ -360,7 +360,7 @@ /XStep \pgf@sys@tonumber\pgf@xc\space /YStep \pgf@sys@tonumber\pgf@yc\space /Matrix [#2\space#3\space#4\space#5\space\pgf@sys@tonumber\pgfutil@tempdima\space\pgf@sys@tonumber\pgfutil@tempdimb] - /Resources << >> %<< + /Resources <</Pattern<<>>>> %<< }% }% \pgfutil@addpdfresource@patterns{/pgfpat#1\space @pgfpatternobject#1}% @@ -444,7 +444,7 @@ /S /Luminosity /G @pgfsmask\csname pgfsmaskxform@#1\endcsname >> >>}%<< - \expandafter\let\csname pgfsmask@#1\endcsname\expandafter\csname pgfsmaskxform@#1\endcsname% + \expandafter\let\csname pgfsmask@#1\expandafter\endcsname\csname pgfsmaskxform@#1\endcsname% } % Transparency groups came from pgfsys-pdftex.def diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm4ht.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm4ht.def index 4235c75d64f..77e7c9bb7a5 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm4ht.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm4ht.def @@ -1,4 +1,4 @@ -% Copyright 2020 by Michal Hoftich +% Copyright 2021 by Michal Hoftich % Copyright 2006 by Till Tantau % % This file may be distributed and/or modified @@ -32,12 +32,11 @@ \def\run@pict@cmd{}% insert the \Picture hooks only in the top nesting level \def\end@pict@cmd{}% \ifdefined\EndPicture\else% We are already inside command that uses \Picture - \ifdefined\inside@pict@cmd% handle nested uses - \else - % use different version of \Picture depending on the vertical mode - \ifvmode\def\run@pict@cmd{\Picture*}\else\def\run@pict@cmd{\Picture+}\fi% + \ifdefined\inside@pict@cmd\else% handle nested uses + \ifdefined\tikzexternalize\else% Support externalize library + \def\run@pict@cmd{\Picture*}% \def\end@pict@cmd{\EndPicture}% - \fi\fi% + \fi\fi\fi% % command used to detect nesting \def\inside@pict@cmd{}% \csname a:tikzpicture\endcsname% @@ -48,16 +47,16 @@ \egroup% } -\AtBeginDocument{ - \NewConfigure{tikzpicture}{2} - \catcode`\:=11 +\AtBeginDocument{% + \NewConfigure{tikzpicture}{2}% + \catcode`\:=11% \Configure{tikzpicture}{% \protect\csname nested:math\endcsname% support display math \run@pict@cmd{}% }{\end@pict@cmd} % configure the output picture format to svg, as it will require dvisvgm % post processing. - \Configure{Picture}{.svg} + \Configure{Picture}{.svg}% % insert tex4ht hooks around TikZ picture box \def\pgfsys@typesetpicturebox#1{% \texfourht@tikz@begin% @@ -65,9 +64,9 @@ \texfourht@tikz@end% } % - \ConfigureEnv{tikzpicture}{\ifvmode\Picture*{}\else\Picture+{}\fi\def\inside@pict@cmd{}}{\EndPicture}{}{} - \ConfigureEnv{pgfpicture}{\ifvmode\Picture*{}\else\Picture+{}\fi\def\inside@pict@cmd{}}{\EndPicture}{}{} - \catcode`\:=12 + \ConfigureEnv{tikzpicture}{\texfourht@tikz@begin}{\texfourht@tikz@end}{}{}% + \ConfigureEnv{pgfpicture}{\texfourht@tikz@begin}{\texfourht@tikz@end}{}{}% + \catcode`\:=12% } diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-luatex.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-luatex.def index b87edd0e6a1..e60b1913a3c 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-luatex.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-luatex.def @@ -220,7 +220,7 @@ /XStep \pgf@sys@tonumber\pgf@xc\space /YStep \pgf@sys@tonumber\pgf@yc\space /Matrix [#2\space#3\space#4\space#5\space\pgf@sys@tonumber\pgfutil@tempdima\space\pgf@sys@tonumber\pgfutil@tempdimb] - /Resources << >> %<< + /Resources <</Pattern<<>>>> %<< } {#8}% \pgfutil@addpdfresource@patterns{/pgfpat#1\space \the\numexpr\pdffeedback lastobj\relax\space 0 R}% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def index 3654670e67c..3b9b33006a8 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def @@ -217,7 +217,7 @@ /XStep \pgf@sys@tonumber\pgf@xc\space /YStep \pgf@sys@tonumber\pgf@yc\space /Matrix [#2\space#3\space#4\space#5\space\pgf@sys@tonumber\pgfutil@tempdima\space\pgf@sys@tonumber\pgfutil@tempdimb] - /Resources << >> %<< + /Resources <</Pattern<<>>>> %<< } {#8}% \pgfutil@addpdfresource@patterns{/pgfpat#1\space \the\pdflastobj\space 0 R}% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def index 01f7cd9fb95..6f6163593dc 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def @@ -9,6 +9,10 @@ \ProvidesFileRCS{pgfsys-textures.def} +\pgfutil@packagewarning + {pgfsys-textures.def}% + {This driver is deprecated and will be removed by the end of 2022. + Please switch to another TeX engine} % Driver commands for textures driver diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def index 6bb0c71595c..a1b0bea98d1 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def @@ -9,6 +9,10 @@ \ProvidesFileRCS{pgfsys-vtex.def} +\pgfutil@packagewarning + {pgfsys-vtex.def}% + {This driver is deprecated and will be removed by the end of 2022. + Please switch to another TeX engine} % Driver commands for vtex diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex index fd87b091816..a6732972997 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex @@ -11,7 +11,9 @@ % Load key mechanism -\input pgfkeys.code.tex +\ifdefined\pgfkeysloaded\else + \input pgfkeys.code.tex +\fi % "pgf" is a family \pgfkeys{/pgf/.is family} @@ -519,7 +521,7 @@ \pgf@ya#4% \advance\pgf@xa by-\pgf@x% \advance\pgf@ya by-\pgf@y% - \pgfmathdivide@\pgf@xa\pgf@ya% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@xa}{\pgf@sys@tonumber\pgf@ya}% \let\aspectr\pgfmathresult% \pgf@xb#5% \pgf@yb#6% @@ -527,12 +529,12 @@ \pgf@yc#8% \advance\pgf@xc by-\pgf@xb% \advance\pgf@yc by-\pgf@yb% - \pgfmathdivide@\pgf@xc\pgf@yc% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@xc}{\pgf@sys@tonumber\pgf@yc}% \let\aspects\pgfmathresult% \ifdim\aspectr pt#9\aspects pt% - \pgfmathdivide@\pgf@xa\pgf@xc% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@xa}{\pgf@sys@tonumber\pgf@xc}% \else% - \pgfmathdivide@\pgf@ya\pgf@yc% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@ya}{\pgf@sys@tonumber\pgf@yc}% \fi% \advance\pgf@x by.5\pgf@xa% \advance\pgf@xb by.5\pgf@xc% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysanimations.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysanimations.code.tex index 49ba41bfc63..05bf9c33289 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysanimations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysanimations.code.tex @@ -890,7 +890,7 @@ % Interval too small: Goto end of interval \def\pgfmathresult{1.0}% \else% - \pgfmathdivide@{\pgf@ya}{\pgf@xa}% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@ya}{\pgf@sys@tonumber\pgf@xa}% \fi% \pgf@x\pgfmathresult pt\relax% \expandafter\pgfsysanim@splitter\the\pgf@x% @@ -926,7 +926,7 @@ % Interval too small: Goto end of interval \def\pgfmathresult{1.0}% \else% - \pgfmathdivide@{\pgf@ya}{\pgf@xa}% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@ya}{\pgf@sys@tonumber\pgf@xa}% \fi% \pgf@x\pgfmathresult pt\relax% \expandafter\pgfsysanim@splitter\the\pgf@x% @@ -971,7 +971,7 @@ % Interval too small: Goto end of interval \def\pgfmathresult{1.0}% \else% - \pgfmathdivide@{\pgf@ya}{\pgf@xa}% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@ya}{\pgf@sys@tonumber\pgf@xa}% \fi% \pgf@x\pgfmathresult pt\relax% \expandafter\pgfsysanim@splitter\the\pgf@x% @@ -1001,7 +1001,8 @@ % Interval too small: Goto end of interval \def\pgfmathresult{1.0}% \else% - \pgfmathdivide@{\pgfsysanim@snap@repeat@arg}{\pgf@xa}% + % `\pgfsysanim@snap@repeat@arg` is a macro storing a dimen value, eg "4.0pt" + \pgfmathdivide@{\pgf@sys@tonumber\dimexpr\pgfsysanim@snap@repeat@arg}{\pgf@sys@tonumber\pgf@xa}% \fi% \pgf@x\pgfmathresult pt\relax% \expandafter\pgfsysanim@splitter\the\pgf@x% @@ -1823,7 +1824,7 @@ \def\pgfsysanim@frac@b{1}% \else% \let\pgfsysanim@divby\pgfmathresult% - \pgfmathsubtract@{\pgf@xc}{\pgfsysanim@prev@time}% + \pgfmathsubtract@{\pgf@sys@tonumber\pgf@xc}{\pgfsysanim@prev@time}% \pgfmathdivide@{\pgfmathresult}{\pgfsysanim@divby}% \ifdim\pgfmathresult pt<0pt\def\pgfmathresult{0}\fi% \ifdim\pgfmathresult pt>1pt\def\pgfmathresult{1}\fi% @@ -1875,7 +1876,7 @@ \pgf@ya\pgfsysanim@ft% \advance\pgf@ya by-\pgfsysanim@frac@a pt% \pgf@yb\pgf@x - \pgfmathreciprocal@{\pgf@yb}% + \pgfmathreciprocal@{\pgf@sys@tonumber\pgf@yb}% \ifdim\pgfmathresult pt>2.5pt% \def\pgfmathresult{2.5}% \fi% @@ -1906,7 +1907,7 @@ \pgf@ya\pgfsysanim@ft% \advance\pgf@ya by-\pgfsysanim@frac@a pt% \pgf@yb\pgf@x - \pgfmathreciprocal@{\pgf@yb}% + \pgfmathreciprocal@{\pgf@sys@tonumber\pgf@yb}% \ifdim\pgfmathresult pt>2.5pt% \def\pgfmathresult{2.5}% \fi% @@ -1938,7 +1939,7 @@ \pgf@ya\pgfsysanim@ft% \advance\pgf@ya by-\pgfsysanim@frac@a pt% \pgf@yb\pgf@x - \pgfmathreciprocal@{\pgf@yb}% + \pgfmathreciprocal@{\pgf@sys@tonumber\pgf@yb}% \ifdim\pgfmathresult pt>2.5pt% \def\pgfmathresult{2.5}% \fi% diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfcalendar.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfcalendar.code.tex index a954d4adf03..0b02457d1ff 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfcalendar.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfcalendar.code.tex @@ -9,7 +9,9 @@ \ProvidesFileRCS{pgfcalendar.code.tex} -\input pgfint.code.tex +\ifdefined\pgfintloaded\else + \input pgfint.code.tex +\fi % Translation stuff @@ -207,7 +209,7 @@ } -\long\def\pgfcalendar@launch@ifdate#1#2#3{% +\long\def\pgfcalendar@launch@ifdate#1{% % When this macro is called, the pgfcalendarifdatexxxx macros must % be setup correctly % @@ -215,9 +217,9 @@ \pgfcalendarmatchesfalse% \pgfqkeys{/pgf/calendar}{#1}% \ifpgfcalendarmatches% - #2% + \expandafter\pgfutil@firstoftwo \else% - #3% + \expandafter\pgfutil@secondoftwo \fi% } diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex index 65b62b8cf98..f81a61c9e1b 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex @@ -10,7 +10,9 @@ \ProvidesPackageRCS{pgffor.code.tex} % pgfmath is needed -\input pgfmath.code.tex +\ifdefined\pgfmathloaded\else + \input pgfmath.code.tex +\fi \newdimen\pgffor@iter \newdimen\pgffor@skip diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex index 184506a1851..f24557f8424 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex @@ -26,6 +26,13 @@ \def\pgfkeys@empty{} \long\def\pgfkeys@firstoftwo#1#2{#1} \long\def\pgfkeys@secondoftwo#1#2{#2} +\long\def\pgfkeys@ifcsname#1{% + \ifcsname#1\endcsname + \expandafter\pgfkeys@firstoftwo + \else + \expandafter\pgfkeys@secondoftwo + \fi +} % This is useful: @@ -55,6 +62,17 @@ \let\pgfkeys@unexpanded \normalunexpanded \fi +\begingroup + \edef\pgfkeys@tmpa{\string\expanded} + \edef\pgfkeys@tmpb{\meaning\pgfkeys@expanded} + \expandafter +\endgroup +\ifx\pgfkeys@tmpa\pgfkeys@tmpb +\else + \pgfkeys@error{PGF requires the \noexpand\expanded primitive} + \csname @@end\expandafter\endcsname\expandafter\end% +\fi + % Set a key to a value % @@ -134,7 +152,7 @@ % % \pgfkeyslet{/algo/swap}{\myswap} -\def\pgfkeyslet#1#2{% +\long\def\pgfkeyslet#1#2{% \expandafter\let\csname pgfk@#1\endcsname#2% } @@ -152,7 +170,10 @@ % % \pgfkeysgetvalue{/tikz/swap}{\myswap} -\def\pgfkeysgetvalue#1#2{\expandafter\let\expandafter#2\csname pgfk@#1\endcsname} +\long\def\pgfkeysgetvalue#1#2{% + \pgfkeys@ifcsname{pgfk@#1}% + {\expandafter\let\expandafter#2\csname pgfk@#1\endcsname}% + {\let#2\relax}} @@ -169,7 +190,8 @@ % % The length is \pgfkeysvalue{/tikz/length}. -\def\pgfkeysvalueof#1{\csname pgfk@#1\endcsname} +\let\pgfkeys@relax\relax +\long\def\pgfkeysvalueof#1{\csname\pgfkeys@ifcsname{pgfk@#1}{pgfk@#1}{pgfkeys@relax}\endcsname} @@ -368,7 +390,9 @@ \def\pgfkeys@case@one{% \pgfkeysifdefined{\pgfkeyscurrentkey/.@cmd}% {\pgfkeysgetvalue{\pgfkeyscurrentkey/.@cmd}{\pgfkeys@code}% - \expandafter\pgfkeys@code\pgfkeyscurrentvalue\pgfeov} + \ifx\pgfkeys@code\relax\expandafter\pgfkeys@firstoftwo\else\expandafter\pgfkeys@secondoftwo\fi + {\pgfkeys@unknown}% + {\expandafter\pgfkeys@code\pgfkeyscurrentvalue\pgfeov}} {\pgfkeys@case@two}% } @@ -436,20 +460,20 @@ \def\pgfkeys@ifexecutehandler#1#2{#1}% \let\pgfkeys@ifexecutehandler@handleall=\pgfkeys@ifexecutehandler \def\pgfkeys@ifexecutehandler@handleonlyexisting#1#2{% - \ifcsname pgfk@excpt@\pgfkeyscurrentname\endcsname% + \pgfkeys@ifcsname{pgfk@excpt@\pgfkeyscurrentname}{% #1% ok, this particular key handler is known and should be processed in any case (for example .try) - \else + }{% % implement the 'only existing' feature here: \pgfkeysifdefined{\pgfkeyscurrentpath}{#1}{% \pgfkeysifdefined{\pgfkeyscurrentpath/.@cmd}{#1}{#2}% }{}% - \fi% + }% }% \def\pgfkeys@ifexecutehandler@handlefullorexisting#1#2{% \ifpgfkeysaddeddefaultpath - \ifcsname pgfk@excpt@\pgfkeyscurrentname\endcsname% + \pgfkeys@ifcsname{pgfk@excpt@\pgfkeyscurrentname}{% #1% ok, this particular key handler is known and be processed in any case (for example .try) - \else + }{% % implement the 'only existing' feature here: \pgfkeysifdefined{\pgfkeyscurrentpath}{% #1% @@ -460,7 +484,7 @@ #2% }% }% - \fi% + }% \else #1% ok, always true if the USER explicitly provided the full key path. \fi @@ -560,7 +584,7 @@ % % Example: % -% \pgfqkeys{/tikz}{myother length/.code=\def\myotherlength{#1}\pgfkeysalso{length=#1}} +% \pgfqkeys{/tikz}{myother length/.code=\def\myotherlength{#1}\pgfkeysalso{length={#1}}} \def\pgfqkeys{\expandafter\pgfkeys@@qset\expandafter{\pgfkeysdefaultpath}}% \long\def\pgfkeys@@qset#1#2#3{\def\pgfkeysdefaultpath{#2/}\pgfkeys@parse#3,\pgfkeys@mainstop\def\pgfkeysdefaultpath{#1}} @@ -578,7 +602,7 @@ % % Example: % -% \pgfkeys{tikz,myother length/.code=\def\myotherlength{#1}\pgfkeysalso{length=#1}} +% \pgfkeys{tikz,myother length/.code=\def\myotherlength{#1}\pgfkeysalso{length={#1}}} \long\def\pgfkeysalso#1{\pgfkeys@parse#1,\pgfkeys@mainstop} @@ -598,7 +622,7 @@ % Example: % % \begingroup -% \pgfqkeysalso{/tikz}{myother length/.code=\def\myotherlength{#1}\pgfkeysalso{length=#1}} +% \pgfqkeysalso{/tikz}{myother length/.code=\def\myotherlength{#1}\pgfkeysalso{length={#1}}} \long\def\pgfqkeysalso#1#2{\def\pgfkeysdefaultpath{#1/}\pgfkeys@parse#2,\pgfkeys@mainstop} @@ -848,12 +872,12 @@ }% } \def\pgfkeys@handle@boolean#1#2{% - \ifcsname#1#2\endcsname% + \pgfkeys@ifcsname{#1#2}{% \csname#1#2\endcsname% - \else% + }{% \def\pgf@marshal{\pgfkeysvalueof{/errors/boolean expected/.@cmd}}% \expandafter\pgf@marshal\expandafter{\pgfkeyscurrentkey}{#2}\pgfeov% - \fi + }% } \pgfkeys{/handlers/.is choice/.code=% @@ -985,12 +1009,12 @@ \long\def\pgfkeys@exp@call#1{\pgfkeysalso{\pgfkeyscurrentpath={#1}}} \def\pgfkeys@mathparse{% - \ifcsname pgfmathparse\endcsname - \expandafter\pgfmathparse - \else + \pgfkeys@ifcsname{pgfmathparse}{% + \pgfmathparse + }{% \pgfkeys@error{You have to load `pgfmath' to use \string\pgfmathparse}% - \expandafter\def\expandafter\pgfmathresult - \fi + \def\pgfmathresult + }% } \pgfkeys{/handlers/.evaluated/.code=\pgfkeys@mathparse{#1}\expandafter\pgfkeys@exp@call\expandafter{\pgfmathresult}} @@ -1044,7 +1068,7 @@ % Utilities -\pgfkeys{/utils/exec/.code=#1} % simply execute the given code directly. +\pgfkeys{/utils/exec/.code={#1}} % simply execute the given code directly. % Errors @@ -1154,7 +1178,55 @@ \def\:{\pgf@keys@utilxifnch} \expandafter\gdef\: {\futurelet\pgf@keys@utillet@token\pgf@keys@utilifnch} } +\chardef\pgfkeys@inputcheck0 +\def\pgfkeys@IfFileExists#1{% + \openin\pgfkeys@inputcheck=#1 + \ifeof\pgfkeys@inputcheck + \expandafter\closein\expandafter\pgfkeys@inputcheck + \expandafter\pgfkeys@secondoftwo + \else + \expandafter\closein\expandafter\pgfkeys@inputcheck + \expandafter\pgfkeys@firstoftwo + \fi +} + +% Library system for pgfkeys +\def\usepgfkeyslibrary{\pgf@keys@utilifnextchar[{\pgfkeys@@uselibrary}{\pgfkeys@uselibrary}} +\def\pgfkeys@@uselibrary[#1]{\pgfkeys@uselibrary{#1}} +\def\pgfkeys@uselibrary#1{\pgfkeys@uselibrary@parse#1,\pgfkeys@mainstop} +\def\pgfkeys@uselibrary@parse{% + \pgf@keys@utilifnextchar\pgfkeys@mainstop{\pgfkeys@cleanup}{\pgfkeys@uselibrary@normal}% +}% +\def\pgfkeys@uselibrary@normal#1,{% + \pgfkeys@uselibrary@load{#1}% + \pgfkeys@uselibrary@parse +} +\def\pgfkeys@uselibrary@load#1{% + \expandafter\pgfkeys@spdef\expandafter\pgf@temp\expandafter{#1}% + \ifx\pgf@temp\pgfkeys@empty\expandafter\pgfkeys@firstoftwo\else\expandafter\pgfkeys@secondoftwo\fi{}{% + \pgfkeys@ifcsname{pgfkeys@library@\pgf@temp @loaded}{}{% + \expandafter\let\csname pgfkeys@library@\pgf@temp @loaded\endcsname=\pgfkeys@empty + \expandafter\edef\csname pgfkeys@library@#1@atcode\endcsname{\the\catcode`\@}% + \expandafter\edef\csname pgfkeys@library@#1@barcode\endcsname{\the\catcode`\|}% + \expandafter\edef\csname pgfkeys@library@#1@dollarcode\endcsname{\the\catcode`\$}% + \catcode`\@=11 + \catcode`\|=12 + \catcode`\$=3 + \pgfkeys@IfFileExists{pgfkeyslibrary\pgf@temp.code.tex}{% + \input pgfkeyslibrary\pgf@temp.code.tex + }{% + \pgfkeys@error{I did not find the pgfkeys library '\pgf@temp'. I looked for the + file named pgfkeyslibrary\pgf@temp.code.tex, but could not find it in the + current texmf trees.}% + }% + \catcode`\@=\csname pgfkeys@library@#1@atcode\endcsname + \catcode`\|=\csname pgfkeys@library@#1@barcode\endcsname + \catcode`\$=\csname pgfkeys@library@#1@dollarcode\endcsname + }% + }% +} -\input pgfkeysfiltered.code.tex +\let\pgfkeys@library@filtered@loaded\pgfkeys@empty +\input pgfkeyslibraryfiltered.code.tex \endinput diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeyslibraryfiltered.code.tex index 5772bcadca7..37972ba7e07 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeyslibraryfiltered.code.tex @@ -300,7 +300,7 @@ \pgfkeysiffamilydefined{#2}{% \pgfkeyssetvalue{#1/family}{#2}% }{% - \pgfkeysalso{/errors/family unknown=#2}% + \pgfkeysalso{/errors/family unknown={#2}}% }% }% diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex index 8f53c1d7ba5..ee194939ee7 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex @@ -23,12 +23,10 @@ % prints out a message to the log. \pgfutil@IfFileExists{pgf.revision.tex}{\input pgf.revision.tex } {% - \def\pgfrevision{0}% + \def\pgfrevision{0.0}% \def\pgfversion{0.0}% - \def\pgfversiondatetime{2014-07-01 00:00:00 +100}% - \def\pgfrevisiondatetime{2014-07-01 00:00:00 +100}% - \def\pgfversiondate{2014/07/01}% - \def\pgfrevisiondate{2014/07/01}% + \def\pgfversiondate{2014-07-01}% + \def\pgfrevisiondate{2014-07-01}% } \begingroup diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common-lists.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common-lists.tex index 5e807b2e4f4..783a53e11e8 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common-lists.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common-lists.tex @@ -18,6 +18,10 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\pgfutil@packagewarning + {pgfutil-common-lists}% + {This package is deprecated and will be removed by the end of 2022} + % Usage: % \pgfapplistnewempty\macro \def\pgfapplistnewempty#1{% diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex index 952af70f550..0ecdc68887b 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex @@ -373,7 +373,7 @@ \pgfutil@InputIfFileExists{pgflibrary\pgf@temp.code.tex}{}{% \pgferror{I did not find the pgf library '\pgf@temp'. I looked for the file named - pgflibrary\pgf@temp.code.tex, but could not find it in in + pgflibrary\pgf@temp.code.tex, but could not find it in the current texmf trees.} }% \catcode`\@=\csname pgf@library@#1@atcode\endcsname @@ -909,6 +909,5 @@ \pgfmath@smuggleone#1% \endgroup }% -\input pgfutil-common-lists.tex \endinput diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def index 07a7fb1a4bf..e88cfb9427d 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def @@ -90,7 +90,10 @@ \def\pgfutil@check@rerun#1#2{\@newl@bel{pgf@lab}{#1}{#2}} -\AtBeginDocument{\AtEndDocument{\clearpage\the\pgfutil@everybye}} +\AtBeginDocument{\AtEndDocument{% + \if\relax\detokenize\expandafter{\the\pgfutil@everybye}\relax\else + \expandafter\clearpage\expandafter\the\expandafter\pgfutil@everybye + \fi}} % \@ifl@t@r is defined \@onlypremable so we have to save it here \let\pgfutil@ifl@t@r=\@ifl@t@r |