diff options
| author | Karl Berry <karl@freefriends.org> | 2020-09-28 20:57:36 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-09-28 20:57:36 +0000 |
| commit | e752903a9ad1c74190305384230882402822846a (patch) | |
| tree | 8d60a64b66091d1c8e34e5af76d413268603b25d /Master/texmf-dist/tex/generic | |
| parent | c452dea4584e1a0650f1ba1f87262a85b511057c (diff) | |
pgf (28sep20)
git-svn-id: svn://tug.org/texlive/trunk@56462 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
205 files changed, 1138 insertions, 487 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 e1dda6194d1..c751bf905dd 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex index 843a8cd23f4..7f079fa841f 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006, 2013 by Till Tantau +% Copyright 2006, 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreexternal.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreexternal.code.tex index 9ec63ff7c66..f6fef57755a 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreexternal.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreexternal.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex index 7b11d45d630..f7783dcd983 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 710ece1fa80..597561a0018 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % @@ -146,7 +146,7 @@ {File "#3" not found when defining mask "#2". Tried all extensions in "\pgfsys@imagesuffixlist"}% \else% - \pgfsys@definemask{#2}% + \pgfsys@definemask% \fi% \expandafter\global\expandafter\let\csname pgf@mask@#2\endcsname=\pgf@mask% } diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorelayers.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorelayers.code.tex index 1c7c01d1eac..158f33d6ac9 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorelayers.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorelayers.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreobjects.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreobjects.code.tex index 1cbdfa0dd22..6906a9d9877 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreobjects.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreobjects.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex index e7b8f98dd36..cafc5329381 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % @@ -130,9 +130,9 @@ \ifdim#1>\pgf@picmaxx\global\pgf@picmaxx#1\fi% \ifdim#2<\pgf@picminy\global\pgf@picminy#2\fi% \ifdim#2>\pgf@picmaxy\global\pgf@picmaxy#2\fi% - \fi% - \ifpgf@size@hooked% - \let\pgf@size@hook@x#1\let\pgf@size@hook@y#2\pgf@path@size@hook% + \ifpgf@size@hooked% + \let\pgf@size@hook@x#1\let\pgf@size@hook@y#2\pgf@path@size@hook% + \fi% \fi% \ifdim#1<\pgf@pathminx\global\pgf@pathminx#1\fi% \ifdim#1>\pgf@pathmaxx\global\pgf@pathmaxx#1\fi% diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex index 0f52985c194..e33f0653ce7 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathusage.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathusage.code.tex index 4ca277c9923..5a9c5fc22bd 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathusage.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathusage.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 cda5b1db3fa..7f72030c42e 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepoints.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepoints.code.tex index 15dfbbf1608..6c28f20b738 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepoints.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepoints.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorequick.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorequick.code.tex index 21e115846fc..4180440b008 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorequick.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorequick.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorerdf.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorerdf.code.tex index ae7e5351716..1069318a4b2 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorerdf.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorerdf.code.tex @@ -1,4 +1,4 @@ -% Copyright 2016 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 27b9da97bbc..6bdf7ae6399 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreshade.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreshade.code.tex index 67f11b2bc36..39a40c54eec 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreshade.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreshade.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % CMYK and grayscale shadings adaptation copyright 2019 by David Purton % % This file may be distributed and/or modified 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 961c657e8cd..76803c0ec3b 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransformations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransformations.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransparency.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransparency.code.tex index 181450ac27a..7da8f5a378f 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransparency.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoretransparency.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % @@ -196,6 +196,7 @@ % Compute new transformation matrix: \pgftransformcm{1}{0}{0}{1}{\pgfqpoint{\pgf@xb}{\pgf@yb}}% \pgftransformcm{\pgf@sys@tonumber{\pgf@xc}}{0}{0}{\pgf@sys@tonumber{\pgf@yc}}{\pgfpointorigin}% + \pgfsys@clipfading% #2% }% \fi% @@ -240,13 +241,13 @@ % Compute new transformation matrix: \pgftransformcm{1}{0}{0}{1}{\pgfqpoint{\pgf@xb}{\pgf@yb}}% \pgftransformcm{\pgf@sys@tonumber{\pgf@xc}}{0}{0}{\pgf@sys@tonumber{\pgf@yc}}{\pgfpointorigin}% + \pgfsys@clipfading% #2% }% \fi% } - % Group things in a a transparency group % % Description: 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 ed9644ac87c..f06c4d9d087 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 @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and others Wibrow +% Copyright 2019 by Till Tantau and others Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.IEC.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.IEC.code.tex index 6647be07771..9d1cfcfcea5 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.IEC.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.IEC.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and others Wibrow +% Copyright 2019 by Till Tantau and others Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.code.tex index 21eeec02b64..2e065d7dda7 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.code.tex @@ -1,5 +1,5 @@ -% Copyright 2008 by Till Tantau and others Wibrow +% Copyright 2019 by Till Tantau and others Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.CDH.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.CDH.code.tex index c0168992532..743bc24be84 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.CDH.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.CDH.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and others Wibrow +% Copyright 2018 by Till Tantau and others Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.IEC.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.IEC.code.tex index 54a1068eb4c..3d74ccd1978 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.IEC.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.IEC.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and others Wibrow +% Copyright 2018 by Till Tantau and others Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.US.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.US.code.tex index 76d48c863ab..b20b4d58ba8 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.US.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.US.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and others Wibrow +% Copyright 2018 by Till Tantau and others Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.code.tex index fb896e6a065..390d022a8a3 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and Mark Wibrow +% Copyright 2018 by Till Tantau and Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.3d.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.3d.code.tex index a01a5720c54..df08b507d5b 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.3d.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.3d.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.barcharts.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.barcharts.code.tex index 3eefe0f81a7..3780a4638af 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.barcharts.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.barcharts.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 c56b29baae5..22fa311db44 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 @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % @@ -2154,6 +2154,11 @@ #1={smooth line} }, visualize as smooth line/.default=line, + visualize as smooth cycle/.style={ + visualize as smooth line={#1}, + #1={smooth cycle} + }, + visualize as smooth cycle/.default=line, visualize as scatter/.style={ new object={ when=after survey, diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.formats.functions.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.formats.functions.code.tex index 40632212a0d..5a04c51646c 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.formats.functions.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.formats.functions.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.polar.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.polar.code.tex index 137e9964cb7..5a37b82854d 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.polar.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.polar.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.sparklines.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.sparklines.code.tex index 127b9805f23..2e2e77ae0b1 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.sparklines.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/datavisualization/tikzlibrarydatavisualization.sparklines.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 74fe15c7eac..ce7db967e61 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 @@ -1,5 +1,5 @@ -% Copyright 2010 by Till Tantau -% Copyright 2011 by Jannis Pohlmann +% Copyright 2019 by Till Tantau +% Copyright 2019 by Jannis Pohlmann % % This file may be distributed and/or modified % @@ -83,6 +83,9 @@ }, set/.code={ \tikz@fig@mustbenamed% + \ifcsname tikz@lg@node@set #1\endcsname\else + \tikzerror{Undefined set `#1'}% + \fi \expandafter\def\expandafter\tikz@alias\expandafter{\tikz@alias% \expandafter\def\expandafter\pgf@temp\expandafter{\csname tikz@lg@node@set #1\endcsname}% \expandafter\expandafter\expandafter\pgfutil@g@addto@macro\expandafter\pgf@temp\expandafter{\expandafter\tikz@lg@do\expandafter{\tikz@fig@name}}% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.standard.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.standard.code.tex index c7f2daf7443..4cac3e51ebd 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.standard.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.standard.code.tex @@ -1,5 +1,5 @@ -% Copyright 2010 by Till Tantau -% Copyright 2011 by Jannis Pohlmann +% Copyright 2019 by Till Tantau +% Copyright 2019 by Jannis Pohlmann % % This file may be distributed and/or modified % 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 55b387f13c6..fd880c3df9e 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 @@ -1,4 +1,4 @@ -% Copyright 2008-2010 by Christian Feuersaenger +% Copyright 2008-2020 by Christian Feuersaenger % % This file may be distributed and/or modified % @@ -872,7 +872,7 @@ \immediate\write\tikzexternal@outmakefile{}% % % support for .dep files and auto-dependencies: - \immediate\write\tikzexternal@outmakefile{include $(ALL_FIGURE_NAMES:\tikzexternal@PERCENTchar=\tikzexternal@PERCENTchar.\tikzexternaldepext)}% + \immediate\write\tikzexternal@outmakefile{-include $(ALL_FIGURE_NAMES:\tikzexternal@PERCENTchar=\tikzexternal@PERCENTchar.\tikzexternaldepext)}% \immediate\write\tikzexternal@outmakefile{}% \tikzexternalmakefiledefaultdeprule \immediate\write\tikzexternal@outmakefile{}% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrary3d.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrary3d.code.tex index aee687e274b..f39eaee8669 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrary3d.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrary3d.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 5a89e4defd1..2bd7e428a62 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 @@ -1,5 +1,5 @@ -% Copyright 2013 by Till Tantau -% Copyright 2018 by Kroum Tzanev +% Copyright 2019 by Till Tantau +% Copyright 2019 by Kroum Tzanev % % This file may be distributed and/or modified % 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 f4dd1716932..4682a0df06c 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 @@ -1,4 +1,4 @@ -% Copyright 2016 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryarrows.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryarrows.code.tex index 946f87455e7..b3f1728e440 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryarrows.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryarrows.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryautomata.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryautomata.code.tex index 93dc77be779..690e0fd63a6 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryautomata.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryautomata.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybabel.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybabel.code.tex index cf307cf6a8c..e24439f75f6 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybabel.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybabel.code.tex @@ -1,4 +1,4 @@ -% Copyright 2013 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybackgrounds.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybackgrounds.code.tex index 690953b8054..1a42a4b40e4 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybackgrounds.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybackgrounds.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybending.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybending.code.tex index be9c8bb707a..169995bcdef 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybending.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarybending.code.tex @@ -1,4 +1,4 @@ -% Copyright 2013 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalc.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalc.code.tex index b6fc75aeef9..373ea7752d0 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalc.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalc.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalendar.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalendar.code.tex index f3e8439491f..3ade8fa1cce 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalendar.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalendar.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 c02f5207044..4708c329646 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 @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 4e61360ee3b..e9967c80857 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 @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.footprints.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.footprints.code.tex index fe42e8b09be..10bc743f24b 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.footprints.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.footprints.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.fractals.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.fractals.code.tex index 9bd837911bc..4ef23427848 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.fractals.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.fractals.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.markings.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.markings.code.tex index 23dcf61da73..04f3e571b14 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.markings.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.markings.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.pathmorphing.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.pathmorphing.code.tex index 4d0eb26dd7a..5bc38b1dc8e 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.pathmorphing.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.pathmorphing.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.pathreplacing.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.pathreplacing.code.tex index cef15dcc5ec..4f52ff9a1e1 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.pathreplacing.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.pathreplacing.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.shapes.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.shapes.code.tex index e1ad8a5e12b..3074a039052 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.shapes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.shapes.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.text.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.text.code.tex index 50b9ebcba67..030135d8f51 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.text.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarydecorations.text.code.tex @@ -1,4 +1,4 @@ -% Copyright 2013 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryer.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryer.code.tex index a2a80a5f49f..acb9b049971 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryer.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryer.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfadings.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfadings.code.tex index bec6487b98a..bddc83cb5cf 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfadings.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfadings.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 4f3dc6be3de..7de158df40c 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 @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfixedpointarithmetic.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfixedpointarithmetic.code.tex index 8560ecfb59b..76616a6dddb 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfixedpointarithmetic.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfixedpointarithmetic.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % 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 143acd9e9e8..065ddd4bbbd 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 @@ -1,5 +1,5 @@ -% Copyright 2006 by Till Tantau -% Copyright 2013 by Nico Van Cleemput +% Copyright 2018 by Till Tantau +% Copyright 2018 by Nico Van Cleemput % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfpu.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfpu.code.tex index ad8d2671ee8..36e0afe133f 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfpu.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryfpu.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008/2009 by Christian Feuersaenger +% Copyright 2008/2018 by Christian Feuersaenger % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryintersections.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryintersections.code.tex index f7ff81b7e2a..ca0e7a1c5e4 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryintersections.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryintersections.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -104,7 +104,7 @@ \pgfmathloop% \ifnum\pgfmathcounter>\pgfintersectionsolutions\relax% \else% - \path[reset cm]\pgfextra{\pgftransformshift{\pgfpointintersectionsolution{\pgfmathcounter}}}% + \path\pgfextra{\pgftransformshift{\pgfpointintersectionsolution{\pgfmathcounter}}}% coordinate (\tikz@intersect@@name-\pgfmathcounter); \repeatpgfmathloop% \ifx\tikz@intersect@by\pgfutil@empty% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarylindenmayersystems.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarylindenmayersystems.code.tex index 89807c8e04d..6763c733e9e 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarylindenmayersystems.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarylindenmayersystems.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % 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 fd876f5d73c..3e703fad986 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 @@ -1,4 +1,4 @@ -% Copyright 2013 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % 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 90894ff206d..507ac7a40d8 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 @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymindmap.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymindmap.code.tex index 4dc97d1aacf..ff5959c4f37 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymindmap.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarymindmap.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypatterns.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypatterns.code.tex index 22ce51d8cbd..8ef495bbba9 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypatterns.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypatterns.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypatterns.meta.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypatterns.meta.code.tex index 4327768186c..de96fd9093a 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypatterns.meta.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypatterns.meta.code.tex @@ -1,4 +1,4 @@ -% Copyright 2015 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -70,9 +70,9 @@ \let\pgfsetstrokecolor=\pgfutil@gobble% \let\pgfsetfillcolor=\pgfutil@gobble% \fi% - \def\tikz@fig{% - \tikzerror{You cannot use nodes inside a pattern}% - }% + \def\tikz@fig{\tikzerror{You cannot use `\string\node' inside a pattern}}% + \def\tikz@edge@plain{\tikzerror{You cannot use `edge' inside a pattern}}% + \def\tikz@to{\tikzerror{You cannot use `to' paths inside a pattern}}% \tikzset{pattern/.code={\tikzerror{You cannot nest patterns}}, pattern color/.style={pattern}}% }% diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypetri.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypetri.code.tex index 7241394d804..80c34c175e1 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypetri.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypetri.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryplothandlers.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryplothandlers.code.tex index 6e1b497b65b..e6db2b62ff1 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryplothandlers.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryplothandlers.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryplotmarks.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryplotmarks.code.tex index 3b2caac869a..15eea572019 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryplotmarks.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryplotmarks.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypositioning.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypositioning.code.tex index 830212928d5..b410975c32c 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypositioning.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarypositioning.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 99efbfeecae..bbd109bcb44 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 @@ -1,4 +1,4 @@ -% Copyright 2011 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryrdf.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryrdf.code.tex index 60c87f0dff9..74e77ac3e2a 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryrdf.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryrdf.code.tex @@ -1,4 +1,4 @@ -% Copyright 2016 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryscopes.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryscopes.code.tex index 6245bf8ec1f..68856d591e4 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryscopes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryscopes.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshadings.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshadings.code.tex index c84fb467699..2cf08776f34 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshadings.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshadings.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshadows.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshadows.code.tex index ebb2abf74c6..3bd60e99fa9 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshadows.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshadows.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.arrows.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.arrows.code.tex index 20e2022c115..c20e6a73ccb 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.arrows.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.arrows.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.callouts.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.callouts.code.tex index 12b4953349f..2a3de5548a6 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.callouts.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.callouts.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.code.tex index 0e1c84a287a..2efb5c33086 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.gates.logic.IEC.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.gates.logic.IEC.code.tex index e41ddf83a00..c34229b1376 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.gates.logic.IEC.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.gates.logic.IEC.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.gates.logic.US.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.gates.logic.US.code.tex index 99411f2b12f..66503414a0d 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.gates.logic.US.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.gates.logic.US.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.geometric.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.geometric.code.tex index ae3d6c7feb5..3e923b940fe 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.geometric.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.geometric.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.misc.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.misc.code.tex index 9a8c13f6221..617c5f40342 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.misc.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.misc.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 797a0e25523..e9d5e2fa84b 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 @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau and Mark Wibrow +% Copyright 2018 by Till Tantau and Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.symbols.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.symbols.code.tex index 6927d8dea40..b616b54c883 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.symbols.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryshapes.symbols.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarysnakes.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarysnakes.code.tex index 64d6fc44f88..9acb6de9153 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarysnakes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarysnakes.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 c9ac86f17ee..1a5e47b4461 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 @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarysvg.path.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarysvg.path.code.tex index 8b64ccc3ce7..521bf96b60f 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarysvg.path.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarysvg.path.code.tex @@ -1,4 +1,4 @@ -% Copyright 2009 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarythrough.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarythrough.code.tex index cb634245327..986235b75b0 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarythrough.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarythrough.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytopaths.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytopaths.code.tex index 121a570f4b5..1461f783f5a 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytopaths.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytopaths.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2020 by Till Tantau % % This file may be distributed and/or modified % @@ -34,7 +34,7 @@ \pgfmathsetmacro\tikz@to@bend{#1}% \fi% \let\tikz@to@out=\tikz@to@bend% - \pgfmathsetmacro\tikz@to@in{180-\tikz@to@out}% + \pgfmathsetmacro\tikz@to@in{180-(\tikz@to@out)}% \tikz@to@switch@on% \tikz@to@relativetrue% } @@ -46,13 +46,8 @@ \pgfmathsetmacro\tikz@to@bend{#1}% \fi% % Now, negate - \pgfmathsetmacro\tikz@to@out{\tikz@to@bend} - \c@pgf@counta=\tikz@to@bend\relax% - \c@pgf@counta=-\c@pgf@counta\relax% - \edef\tikz@to@out{\the\c@pgf@counta}% - \c@pgf@counta=180\relax% - \advance\c@pgf@counta by-\tikz@to@out\relax% - \edef\tikz@to@in{\the\c@pgf@counta}% + \pgfmathsetmacro\tikz@to@out{-(\tikz@to@bend)} + \pgfmathsetmacro\tikz@to@in{180-(\tikz@to@out)} \tikz@to@switch@on% \tikz@to@relativetrue% } @@ -97,12 +92,12 @@ \def\tikz@to@set@in@looseness#1{% - \def\tikz@to@in@looseness{#1}% + \pgfmathsetmacro\tikz@to@in@looseness{#1}% \let\tikz@to@end@compute=\tikz@to@end@compute@looseness% \tikz@to@switch@on% } \def\tikz@to@set@out@looseness#1{% - \def\tikz@to@out@looseness{#1}% + \pgfmathsetmacro\tikz@to@out@looseness{#1}% \let\tikz@to@start@compute=\tikz@to@start@compute@looseness% \tikz@to@switch@on% } diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytrees.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytrees.code.tex index 8ff54a03123..d457f979b97 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytrees.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarytrees.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 76272f1a6cf..58fd46b40c2 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 @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryviews.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryviews.code.tex index 746dd60f638..8ced1b64f3c 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryviews.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibraryviews.code.tex @@ -1,4 +1,4 @@ -% Copyright 2015 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 01b1b9d346f..a371ddfc7cf 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 @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % @@ -790,13 +790,9 @@ \pgf@xc=\pgf@x% \pgf@yc=\pgf@y% \tikz@label@simplefalse% - \iftikz@fullytransformed% - \tikz@label@simpletrue% - \else - \ifdim\pgf@xc=\pgf@xb\relax% - \ifdim\pgf@yc=\pgf@yb\relax% - \tikz@label@simpletrue% - \fi% + \ifdim\pgf@xc=\pgf@xb\relax% + \ifdim\pgf@yc=\pgf@yb\relax% + \tikz@label@simpletrue% \fi% \fi% \iftikz@label@simple% @@ -3999,6 +3995,44 @@ {\pgfutil@ifnextchar e{\tikz@fig@mustbenamed\tikz@fig@continue} {\ifx\tikz@after@path\pgfutil@empty\expandafter\tikz@fig@continue\else\expandafter\tikz@fig@mustbenamed\expandafter\tikz@fig@continue\fi}}}}}%}% +\tikzset{ + matrix/inner style/every cell/.code={% + \tikzset{every cell/.try={\the\pgfmatrixcurrentrow}{\the\pgfmatrixcurrentcolumn}}% + }, + matrix/inner style/column/.code={% + \tikzset{column \the\pgfmatrixcurrentcolumn/.try}% + }, + matrix/inner style/even odd column/.code={ + \ifodd\pgfmatrixcurrentcolumn% + \tikzset{every odd column/.try}% + \else% + \tikzset{every even column/.try}% + \fi + }, + matrix/inner style/row/.code={% + \tikzset{row \the\pgfmatrixcurrentrow/.try}% + }, + matrix/inner style/even odd row/.code={% + \ifodd\pgfmatrixcurrentrow% + \tikzset{every odd row/.try}% + \else% + \tikzset{every even row/.try}% + \fi + }, + matrix/inner style/cell/.code={% + \tikzset{row \the\pgfmatrixcurrentrow\space column \the\pgfmatrixcurrentcolumn/.try}% + }, + matrix/inner style order/.store in=\tikz@common@matrix@code@styleorder, + matrix/inner style order={ + every cell, + column, + even odd column, + row, + even odd row, + cell + }, +}% + \def\tikz@do@matrix{% \tikzset{every matrix/.try}% \tikz@node@transformations% @@ -4050,20 +4084,14 @@ \def\tikz@common@matrix@code{% \let\tikz@options=\pgfutil@empty% \let\tikz@mode=\pgfutil@empty% - \tikzset{every cell/.try={\the\pgfmatrixcurrentrow}{\the\pgfmatrixcurrentcolumn}}% - \tikzset{column \the\pgfmatrixcurrentcolumn/.try}% - \ifodd\pgfmatrixcurrentcolumn% - \tikzset{every odd column/.try}% - \else% - \tikzset{every even column/.try}% - \fi% - \tikzset{row \the\pgfmatrixcurrentrow/.try}% - \ifodd\pgfmatrixcurrentrow% - \tikzset{every odd row/.try}% - \else% - \tikzset{every even row/.try}% - \fi% - \tikzset{row \the\pgfmatrixcurrentrow\space column \the\pgfmatrixcurrentcolumn/.try}% + \pgfutil@for\pgf@temp:=\tikz@common@matrix@code@styleorder\do{% + \toks0=\expandafter{\romannumeral-`0\expandafter\pgfutil@trimspaces\expandafter{\pgf@temp}}% + \def\pgf@marshal{}% + \pgfutil@ifempty\pgf@temp{}{% + \edef\pgf@marshal{\noexpand\tikzset{matrix/inner style/.cd,\the\toks0}}% + }% + \pgf@marshal + }% \tikz@options% }% \def\pgfmatrixendcode{% @@ -5431,7 +5459,13 @@ \tikz@shapebordertrue% \def\tikz@shapeborder@name{\tikz@pp@name{#2}}% \fi% - \fi + \else\ifcsname pgf@sh@ns@#2\endcsname + \expandafter\ifx\csname pgf@sh@ns@#2\endcsname\tikz@coordinate@text% + \else + \tikz@shapebordertrue% + \def\tikz@shapeborder@name{#2}% + \fi% + \fi\fi \fi% \edef\tikz@marshal{\noexpand#1{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}}% \tikz@marshal% diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/ControlElectric.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/ControlElectric.lua index 47e3cee45da..c9f129c28d2 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/ControlElectric.lua +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/ControlElectric.lua @@ -39,16 +39,24 @@ declare { Two typical effects of increasing the |electric charge| are distortion of symmetries and an upscaling of the drawings. "]], - examples = {[[" - \tikz \graph [spring electrical layout, horizontal=0 to 1] - { 0 [electric charge=1] -- subgraph C_n [n=10] }; - "]],[[" - \tikz \graph [spring electrical layout, horizontal=0 to 1] - { 0 [electric charge=5] -- subgraph C_n [n=10] }; - "]],[[" - \tikz \graph [spring electrical layout, horizontal=0 to 1] - { [clique] 1 [electric charge=5], 2, 3, 4 }; - "]] + examples = { + { + options = [["preamble={\usetikzlibrary{graphs,graphdrawing} \usegdlibrary{force}}"]], + code = [[" + \tikz \graph [spring electrical layout, horizontal=0 to 1] + { 0 [electric charge=1] -- subgraph C_n [n=10] }; + "]] + },{ + code = [[" + \tikz \graph [spring electrical layout, horizontal=0 to 1] + { 0 [electric charge=5] -- subgraph C_n [n=10] }; + "]] + },{ + code = [[" + \tikz \graph [spring electrical layout, horizontal=0 to 1] + { [clique] 1 [electric charge=5], 2, 3, 4 }; + "]] + } } } diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/experimental/tikzlibrarygraphdrawing.evolving.code.tex b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/experimental/tikzlibrarygraphdrawing.evolving.code.tex index 9d9055dfe96..efa214a12ef 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/experimental/tikzlibrarygraphdrawing.evolving.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/experimental/tikzlibrarygraphdrawing.evolving.code.tex @@ -1,4 +1,4 @@ -% Copyright 2016 by Malte Skambath +% Copyright 2018 by Malte Skambath % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.circular.code.tex b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.circular.code.tex index cdcd7a54cb3..2fec25131d6 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.circular.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.circular.code.tex @@ -1,5 +1,5 @@ -% Copyright 2010 by Renée Ahrens, Olof Frahm, Jens Kluttig, Matthias Schulz, Stephan Schuster -% Copyright 2011 by Till Tantau +% Copyright 2019 by Renée Ahrens, Olof Frahm, Jens Kluttig, Matthias Schulz, Stephan Schuster +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.code.tex b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.code.tex index 385c9705953..63efd352f1a 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.code.tex @@ -1,5 +1,5 @@ -% Copyright 2010 by Renée Ahrens, Olof Frahm, Jens Kluttig, Matthias Schulz, Stephan Schuster -% Copyright 2011 by Till Tantau +% Copyright 2018 by Renée Ahrens, Olof Frahm, Jens Kluttig, Matthias Schulz, Stephan Schuster +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.examples.code.tex b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.examples.code.tex index 90ebe0f15af..3a1308320cf 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.examples.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.examples.code.tex @@ -1,4 +1,4 @@ -% Copyright 2012 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.force.code.tex b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.force.code.tex index 2ffad530012..a06d99c5d5d 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.force.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.force.code.tex @@ -1,4 +1,4 @@ -% Copyright 2011 by Jannis Pohlmann +% Copyright 2019 by Jannis Pohlmann % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.layered.code.tex b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.layered.code.tex index 940c8236cf3..322296b11b8 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.layered.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.layered.code.tex @@ -1,4 +1,4 @@ -% Copyright 2011 by Jannis Pohlmann +% Copyright 2019 by Jannis Pohlmann % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.trees.code.tex b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.trees.code.tex index 87ff6eee233..2c05576a86d 100644 --- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.trees.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/tex/pgflibrarygraphdrawing.trees.code.tex @@ -1,5 +1,5 @@ -% Copyright 2010 by Renée Ahrens, Olof Frahm, Jens Kluttig, Matthias Schulz, Stephan Schuster -% Copyright 2011 by Till Tantau +% Copyright 2019 by Renée Ahrens, Olof Frahm, Jens Kluttig, Matthias Schulz, Stephan Schuster +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 0967f817d27..32d1b1b7a09 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 @@ -1,5 +1,5 @@ -% Copyright 2010 by Renée Ahrens, Olof Frahm, Jens Kluttig, Matthias Schulz, Stephan Schuster -% Copyright 2011 by Till Tantau +% Copyright 2018 by Renée Ahrens, Olof Frahm, Jens Kluttig, Matthias Schulz, Stephan Schuster +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.barcharts.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.barcharts.code.tex index da124ee8401..3ac0d476f94 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.barcharts.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.barcharts.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.formats.functions.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.formats.functions.code.tex index 540901936fe..d1e87cb1f7f 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.formats.functions.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.formats.functions.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.polar.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.polar.code.tex index f56ebe3e7f0..a7d493491ff 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.polar.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/datavisualization/pgflibrarydatavisualization.polar.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.footprints.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.footprints.code.tex index 369a0ecbd09..4fc6565c1b9 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.footprints.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.footprints.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.fractals.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.fractals.code.tex index 2327c770295..8355460b54c 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.fractals.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.fractals.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.markings.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.markings.code.tex index 6a17dbe3c0a..23b7ff672ed 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.markings.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.markings.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % @@ -89,6 +89,7 @@ \pgfinterruptpath% \pgfscope% \let\pgf@lib@dec@mark@marks=\pgfutil@empty% + \pgfslopedattimefalse \pgf@lib@dec@computed@action% \endpgfscope% \endpgfinterruptpath% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.pathmorphing.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.pathmorphing.code.tex index 72ed4ca6b6e..bdc2752cb8e 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.pathmorphing.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.pathmorphing.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.pathreplacing.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.pathreplacing.code.tex index 10f8371c470..f028ec6c375 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.pathreplacing.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.pathreplacing.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow and Till Tantau +% Copyright 2018 by Mark Wibrow and Till Tantau % % This file may be distributed and/or modified % 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 08781d04fb8..2341ee2c554 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 @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.text.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.text.code.tex index 4d31c46fcfc..301fa247845 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.text.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/decorations/pgflibrarydecorations.text.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/luamath/pgflibraryluamath.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/luamath/pgflibraryluamath.code.tex index 7a94b6f8fde..cd991dab4c5 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/luamath/pgflibraryluamath.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/luamath/pgflibraryluamath.code.tex @@ -1,5 +1,5 @@ -% Copyright 2011 by Christophe Jorssen and Mark Wibrow -% Copyright 2014 by Christian Feuersänger +% Copyright 2019 by Christophe Jorssen and Mark Wibrow +% Copyright 2019 by Christian Feuersänger % % This file may be distributed and/or modified % @@ -221,7 +221,7 @@ \pgfluamath@makeparserinactive \else \pgfmath@error{Sorry, you need the luaTeX engine to use the - luamath library}% + luamath library}{}% \fi}, luamath/parser and computation/.code={% \pgfutil@ifluatex @@ -229,7 +229,7 @@ \pgfluamath@makeparseractive \else \pgfmath@error{Sorry, you need the luaTeX engine to use the - luamath library}% + luamath library}{}% \fi}, luamath/off/.code={% \pgfluamath@makecomputationinactive @@ -245,7 +245,7 @@ \pgfluamath@makeparseractive \else \pgfmath@error{Sorry, you need the luaTeX engine to use the - luamath library}% + luamath library}{}% \fi }, luamath/output format/.is choice, diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.code.tex index 92d2f1e6864..96216c5f244 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.meta.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.meta.code.tex index af509c1af64..dbe2fb77d47 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.meta.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.meta.code.tex @@ -1,4 +1,4 @@ -% Copyright 2013 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.spaced.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.spaced.code.tex index 166ed875333..f125afddca4 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.spaced.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.spaced.code.tex @@ -1,4 +1,4 @@ -% Copyright 2012 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarybbox.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarybbox.code.tex deleted file mode 100644 index 38690faed14..00000000000 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarybbox.code.tex +++ /dev/null @@ -1,94 +0,0 @@ -% Copyright 2019 by an anonymous contributor -% -% This file may be distributed and/or modified -% -% 1. under the LaTeX Project Public License and/or -% 2. under the GNU General Public License. -% -% See the file doc/generic/pgf/licenses/LICENSE for more details. - -\global\let\pgf@bbox@lt@curveto@normal\pgf@lt@curveto -\global\let\pgf@bbox@nlt@curveto@normal\pgf@nlt@curveto - -\pgfqkeys{/pgf}{bezier bounding box/.is if=pgf@bbox@switch@} - -\def\pgf@bbox@switch@false{% - \let\pgf@lt@curveto \pgf@bbox@lt@curveto@normal - \let\pgf@nlt@curveto\pgf@bbox@nlt@curveto@normal -} - -\def\pgf@bbox@switch@true{% - \let\pgf@lt@curveto \pgf@bbox@curveto - \let\pgf@nlt@curveto\pgf@bbox@curveto -} - -\def\pgf@bbox@curveto#1#2#3#4#5#6{% - % extrema in x - \pgfmathsetmacro{\pgf@temp@b}{abs(\pgf@path@lastx-#5-3*#1+3*#3)}% - % ^^^ this is used for the denominator below, cannot become too small - \pgfmathsetmacro{\pgf@temp@c}{max(1+\pgf@path@lastx,max(#1,max(#3,#5)))}% - % ^^^ in order to avoid dimension too large errors from squaring lengths in pt - \pgfmathparse{((#1/\pgf@temp@c)*(#1/\pgf@temp@c)-1*((#1/\pgf@temp@c)*(#3/\pgf@temp@c))+(#3/\pgf@temp@c)*(#3/\pgf@temp@c)-1*((#1/\pgf@temp@c)*(#5/\pgf@temp@c))+(-(#3/\pgf@temp@c)+(#5/\pgf@temp@c))*(\pgf@path@lastx/\pgf@temp@c))}% - \pgfutil@tempdima=\pgfmathresult pt\relax% - % ^^^ discriminant - \ifdim\pgf@temp@b pt<0.01pt\relax% - % approximately linear - \pgfmathparse{abs(2*(#1)-2*(#3)+(#5))}% - \pgfutil@tempdimb=\pgfmathresult pt\relax% - \ifdim\pgfutil@tempdimb<0.1pt\relax% - % if the denominator is very small, t is *likely* large but could be 0/0 - \else - \pgfmathsetmacro{\pgf@temp@a}{(2*(#1)-3*(#3)+(#5))/(2*(#1)-2*(#3)+(#5))}% - \pgfmathparse{\pgf@path@lastx*pow(1-\pgf@temp@a,3)+3*#1*pow(1-\pgf@temp@a,2)*\pgf@temp@a+3*#3*(1-\pgf@temp@a)*\pgf@temp@a*\pgf@temp@a+#5*pow(\pgf@temp@a,3)}% - \pgfutil@tempdimb=\pgfmathresult pt\relax% - \pgf@protocolsizes{\pgfutil@tempdimb}{#6}% - \fi% - \else - \ifdim\pgfutil@tempdima<0pt\relax% negative discriminant -> no turning point - \else - \pgfmathsetmacro{\pgf@temp@a}{min(1,max(0,(\pgf@path@lastx-2*#1+#3-\pgf@temp@c*sqrt(\pgfutil@tempdima))/(\pgf@path@lastx-#5-3*#1+3*#3)))}% - \pgfmathparse{\pgf@path@lastx*pow(1-\pgf@temp@a,3)+3*#1*pow(1-\pgf@temp@a,2)*\pgf@temp@a+3*#3*(1-\pgf@temp@a)*\pgf@temp@a*\pgf@temp@a+#5*pow(\pgf@temp@a,3)}% - \pgfutil@tempdimb=\pgfmathresult pt\relax% - \pgf@protocolsizes{\pgfutil@tempdimb}{#6}% - \pgfmathsetmacro{\pgf@temp@a}{min(1,max(0,(\pgf@path@lastx-2*#1+#3+\pgf@temp@c*sqrt(\pgfutil@tempdima))/(\pgf@path@lastx-#5-3*#1+3*#3)))}% - \pgfmathparse{\pgf@path@lastx*pow(1-\pgf@temp@a,3)+3*#1*pow(1-\pgf@temp@a,2)*\pgf@temp@a+3*#3*(1-\pgf@temp@a)*\pgf@temp@a*\pgf@temp@a+#5*pow(\pgf@temp@a,3)}% - \pgfutil@tempdimb=\pgfmathresult pt\relax% - \pgf@protocolsizes{\pgfutil@tempdimb}{#6}% - \fi% - \fi - %%%%%%%%%%%%%%%%%%%%%%%%%%% - % extrema in y (completely analogous to the above) - \pgfmathsetmacro{\pgf@temp@b}{abs(\pgf@path@lasty-#6-3*#2+3*#4)}% - \pgfmathsetmacro{\pgf@temp@c}{max(1+\pgf@path@lasty,max(#2,max(#4,#6)))}% - \pgfmathparse{((#2/\pgf@temp@c)*(#2/\pgf@temp@c)-1*((#2/\pgf@temp@c)*(#4/\pgf@temp@c))+(#4/\pgf@temp@c)*(#4/\pgf@temp@c)-1*((#2/\pgf@temp@c)*(#6/\pgf@temp@c))+(-(#4/\pgf@temp@c)+(#6/\pgf@temp@c))*(\pgf@path@lasty/\pgf@temp@c))}% - \pgfutil@tempdima=\pgfmathresult pt\relax% - % ^^^ discriminant - \ifdim\pgf@temp@b pt<0.01pt\relax% - % approximately linear - \pgfmathparse{abs(2*(#2)-2*(#4)+(#6))}% - \pgfutil@tempdimb=\pgfmathresult pt\relax% - \ifdim\pgfutil@tempdimb<0.1pt\relax% - % if the denominator is very small, t is *likely* large but could be 0/0 - \else - \pgfmathsetmacro{\pgf@temp@a}{(2*(#2)-3*(#4)+(#6))/(2*(#2)-2*(#4)+(#6))}% - \pgfmathparse{\pgf@path@lasty*pow(1-\pgf@temp@a,3)+3*#2*pow(1-\pgf@temp@a,2)*\pgf@temp@a+3*#4*(1-\pgf@temp@a)*\pgf@temp@a*\pgf@temp@a+#6*pow(\pgf@temp@a,3)}% - \pgfutil@tempdimb=\pgfmathresult pt\relax% - \pgf@protocolsizes{#5}{\pgfutil@tempdimb}% - \fi% - \else - \ifdim\pgfutil@tempdima<0pt\relax% negative discriminant -> no turning point - \else - \pgfmathsetmacro{\pgf@temp@a}{min(1,max(0,(\pgf@path@lasty-2*#2+#4-\pgf@temp@c*sqrt(\pgfutil@tempdima))/(\pgf@path@lasty-#6-3*#2+3*#4)))}% - \pgfmathparse{\pgf@path@lasty*pow(1-\pgf@temp@a,3)+3*#2*pow(1-\pgf@temp@a,2)*\pgf@temp@a+3*#4*(1-\pgf@temp@a)*\pgf@temp@a*\pgf@temp@a+#6*pow(\pgf@temp@a,3)}% - \pgfutil@tempdimb=\pgfmathresult pt\relax% - \pgf@protocolsizes{#5}{\pgfutil@tempdimb}% - \pgfmathsetmacro{\pgf@temp@a}{min(1,max(0,(\pgf@path@lasty-2*#2+#4+\pgf@temp@c*sqrt(\pgfutil@tempdima))/(\pgf@path@lasty-#6-3*#2+3*#4)))}% - \pgfmathparse{\pgf@path@lasty*pow(1-\pgf@temp@a,3)+3*#2*pow(1-\pgf@temp@a,2)*\pgf@temp@a+3*#4*(1-\pgf@temp@a)*\pgf@temp@a*\pgf@temp@a+#6*pow(\pgf@temp@a,3)}% - \pgfutil@tempdimb=\pgfmathresult pt\relax% - \pgf@protocolsizes{#5}{\pgfutil@tempdimb}% - \fi% - \fi - \pgf@protocolsizes{\pgf@path@lastx}{\pgf@path@lasty}% - \pgf@protocolsizes{#5}{#6}% - \pgfsyssoftpath@curveto{\the#1}{\the#2}{\the#3}{\the#4}{\the#5}{\the#6}% -} diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex index 941704d1767..12f26ccbdf8 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex @@ -1,4 +1,4 @@ -% Copyright 2013 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfadings.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfadings.code.tex index 8d25f73b37d..c8ce556b406 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfadings.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfadings.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfixedpointarithmetic.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfixedpointarithmetic.code.tex index b860192f45c..b10c7b795cb 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfixedpointarithmetic.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfixedpointarithmetic.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfpu.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfpu.code.tex index 270d9af8b5c..c3bb9582c51 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfpu.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryfpu.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008/2009 by Christian Feuersaenger +% Copyright 2008/2019 by Christian Feuersaenger % % This file may be distributed and/or modified % @@ -88,6 +88,15 @@ \let\pgfmathfloat@relthresh=\pgfmathresult }, fpu/rel thresh=1e-4, + fpu/install only/.code={ + \pgfmath@warning{The key `/pgf/fpu/install only' is experimental and might % + change or disappear at any point!}% + \edef\pgf@list{#1}% + \pgfutil@for\pgf@temp:=\pgf@list\do{% + \expandafter\pgfmath@float@install@singlefunction\expandafter{% + \romannumeral-`0\expandafter\pgfutil@trimspaces\expandafter{\pgf@temp}}% + }% + }, }% \pgfmathfloatcreate{1}{1.0}{0}\let\pgfmathfloatscale=\pgfmathresult @@ -292,6 +301,40 @@ \pgfmathfloat@install\pgfmathscientific=\pgfmathfloatscientific% }% +\def\pgfmath@float@install@singlefunction#1{% + \ifcsname pgfmath@function@#1\endcsname\else + \pgfmath@error{The function `#1' does not exist}{}% + \fi + \pgfmath@toks={}% + \pgfmathloop + \ifnum\pgfmathcounter>\csname pgfmath@operation@#1@arity\endcsname\relax% + \else + \expandafter\pgfmath@addto@toks\expandafter{\pgfmath@char@hash}% + \expandafter\pgfmath@addto@toks\expandafter{\pgfmathcounter}% + \repeatpgfmathloop + \edef\pgfmath@head{\noexpand\def\expandafter\noexpand\csname pgfmath#1@\endcsname\the\pgfmath@toks}% + \pgfmath@toks={}% + \def\pgfmath@arguments{}% + \pgfmathloop + \ifnum\pgfmathcounter>\csname pgfmath@operation@#1@arity\endcsname\relax% + \else + \pgfmath@addto@toks{\pgfmathfloatparsenumber}% + \expandafter\expandafter\expandafter\pgfmath@addto@toks + \expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter + {\expandafter\pgfmath@char@hash\pgfmathcounter}}% + \pgfmath@addto@toks{\let}% + \expandafter\pgfmath@addto@toks\expandafter{% + \csname pgfmath@argument@\pgfmathcounter\endcsname=\pgfmathresult}% + \expandafter\expandafter\expandafter\def\expandafter\expandafter\expandafter + \pgfmath@arguments\expandafter\expandafter\expandafter{\expandafter + \pgfmath@arguments\expandafter{\csname pgfmath@argument@\pgfmathcounter\endcsname}}% + \repeatpgfmathloop + \expandafter\pgfmath@addto@toks\expandafter{\csname pgfmathfloat#1@\expandafter\endcsname\pgfmath@arguments}% + \pgfmath@addto@toks{\pgfmathfloattofixed{\pgfmathresult}}% + \edef\pgfmath@body{{\the\pgfmath@toks}}% + \expandafter\pgfmath@head\pgfmath@body +} + \def\pgfmathfloat@iftrue{% \if Y\pgfmathfloatparse@output@choice \let\pgfmathfloat@@iftrue@v=\pgfmathfloatone @@ -864,7 +907,7 @@ \def\pgfmathfloattoextentedprecision#1{% \begingroup \pgfmathfloattoextentedprecision@a{#1}% - \pgfmathfloatcreate{\pgfmathfloat@a@S}{\pgfmathresult}{\pgfmathfloat@a@E}% + \pgfmathfloatcreate{\the\pgfmathfloat@a@S}{\pgfmathresult}{\the\pgfmathfloat@a@E}% \pgfmath@smuggleone\pgfmathresult \endgroup }% diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryintersections.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryintersections.code.tex index 81b7d29c37d..c920dbae886 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryintersections.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryintersections.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -352,7 +352,9 @@ \pgf@iflinesintersect{#1}{#2}{#3}{#4}% {% \pgfextract@process\pgf@intersect@solution@candidate{% + \pgftransforminvert % pgf@x and pgf@y are already assigned by \pgf@iflinesintersect + \pgfpointtransformed{\pgfqpoint{\pgf@x}{\pgf@y}}% }% \pgf@ifsolution@duplicate{\pgf@intersect@solution@candidate}{% % ah - we a duplicate. Apparently, we have a hit on an 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 bec0c855cda..a458eb8e6ab 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarylindenmayersystems.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarylindenmayersystems.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.code.tex index 908d7490030..a2dba8e0763 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.meta.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.meta.code.tex index d04e75ab238..00de962abe6 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.meta.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.meta.code.tex @@ -1,4 +1,4 @@ -% Copyright 2015 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -185,7 +185,7 @@ \pgf@pat@@checkname#1[]\pgf@patstop}% \def\pgf@pat@@checkname#1[#2]#3\pgf@patstop{% - \def\pgf@pat@onlinename{#1}% + \expandafter\def\expandafter\pgf@pat@onlinename\expandafter{\romannumeral-`0\pgfutil@trimspaces{#1}}% \def\pgf@pat@onlineoptions{#2}% }% @@ -217,7 +217,7 @@ \def\pgf@pat@macroaskeys#1#2{% \pgfutil@toks@\expandafter{#2}% - \edef\pgf@marshal{\noexpand\pgfkeys{#1, \the\pgfutil@toks@}}% + \edef\pgf@marshal{\noexpand\pgfkeys{,#1,\the\pgfutil@toks@}}% \pgf@marshal% }% \def\pgfsetfillpattern#1#2{% @@ -298,11 +298,11 @@ {\pgfkeysvalueof{/pgf/pattern keys/distance}}% {\pgfkeysvalueof{/pgf/pattern keys/distance}}}, tile transformation={% - \pgftransformrotate{\pgfkeysvalueof{/pgf/pattern keys/angle}}% \pgftransformshift{% \pgfpoint {\pgfkeysvalueof{/pgf/pattern keys/xshift}}% - {\pgfkeysvalueof{/pgf/pattern keys/yshift}}}}, + {\pgfkeysvalueof{/pgf/pattern keys/yshift}}}% + \pgftransformrotate{\pgfkeysvalueof{/pgf/pattern keys/angle}}}, defaults={ distance/.initial=3pt, angle/.initial=0, @@ -340,11 +340,11 @@ {\pgfkeysvalueof{/pgf/pattern keys/distance}}% {\pgfkeysvalueof{/pgf/pattern keys/distance}}}, tile transformation={% - \pgftransformrotate{\pgfkeysvalueof{/pgf/pattern keys/angle}}% \pgftransformshift{% \pgfpoint {\pgfkeysvalueof{/pgf/pattern keys/xshift}}% - {\pgfkeysvalueof{/pgf/pattern keys/yshift}}}}, + {\pgfkeysvalueof{/pgf/pattern keys/yshift}}}% + \pgftransformrotate{\pgfkeysvalueof{/pgf/pattern keys/angle}}}, defaults={ distance/.initial=3pt, angle/.initial=0, @@ -384,11 +384,11 @@ {\pgfkeysvalueof{/pgf/pattern keys/distance}}% {\pgfkeysvalueof{/pgf/pattern keys/distance}}}, tile transformation={% - \pgftransformrotate{\pgfkeysvalueof{/pgf/pattern keys/angle}}% \pgftransformshift{% \pgfpoint {\pgfkeysvalueof{/pgf/pattern keys/xshift}}% - {\pgfkeysvalueof{/pgf/pattern keys/yshift}}}}, + {\pgfkeysvalueof{/pgf/pattern keys/yshift}}}% + \pgftransformrotate{\pgfkeysvalueof{/pgf/pattern keys/angle}}}, defaults={ distance/.initial=3pt, angle/.initial=0, @@ -427,11 +427,11 @@ {\pgfkeysvalueof{/pgf/pattern keys/distance}}% {\pgfkeysvalueof{/pgf/pattern keys/distance}}}, tile transformation={% - \pgftransformrotate{\pgfkeysvalueof{/pgf/pattern keys/angle}}% \pgftransformshift{% \pgfpoint {\pgfkeysvalueof{/pgf/pattern keys/xshift}}% - {\pgfkeysvalueof{/pgf/pattern keys/yshift}}}}, + {\pgfkeysvalueof{/pgf/pattern keys/yshift}}}% + \pgftransformrotate{\pgfkeysvalueof{/pgf/pattern keys/angle}}}, defaults={ distance/.initial=3mm, angle/.initial=0, diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex index 3f0fc8d268d..d0b9a388eb1 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 24bc7b8de72..c9e6c141a51 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryprofiler.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryprofiler.code.tex index fe98a5f3f2e..d6327db0628 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryprofiler.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryprofiler.code.tex @@ -2,7 +2,7 @@ % % TeX profiling library % -% Copyright 2010 by Christian Feuersänger. +% Copyright 2018 by Christian Feuersänger. % % This program is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshadings.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshadings.code.tex index 02c2f8c1941..81e0386a605 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshadings.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshadings.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and others +% Copyright 2019 by Till Tantau and others % CMYK and grayscale shadings adaptation copyright 2019 by David Purton % % This file may be distributed and/or modified diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysnakes.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysnakes.code.tex index f964dca2751..c45140535e6 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysnakes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysnakes.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysvg.path.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysvg.path.code.tex index 208b42de704..e802ca778e3 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysvg.path.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysvg.path.code.tex @@ -1,4 +1,4 @@ -% Copyright 2009 by Till Tantau +% Copyright 2019 by Till Tantau % Copyright 2019 by Jonathan P. Spratte % % This file may be distributed and/or modified diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytimelines.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytimelines.code.tex index dd9b38fdc46..0e9afce0f2b 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytimelines.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytimelines.code.tex @@ -1,4 +1,4 @@ -% Copyright 2015 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.ee.IEC.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.ee.IEC.code.tex index 62b1a260299..0d25e307e46 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.ee.IEC.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.ee.IEC.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and others Wibrow +% Copyright 2018 by Till Tantau and others Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.ee.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.ee.code.tex index 4cfa4eed7d6..c8f95ff4bfe 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.ee.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.ee.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and others Wibrow +% Copyright 2018 by Till Tantau and others Wibrow % % This file may be distributed and/or modified % 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 9b964996d70..69f27e7d0d1 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 @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.US.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.US.code.tex index 3a496324f81..3f0d668ca09 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.US.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.US.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.code.tex index 68005a61478..474a183d6f7 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/circuits/pgflibraryshapes.gates.logic.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % 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 0859687f9d4..c2f06697c69 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 @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau and Mark Wibrow +% Copyright 2018 by Till Tantau and Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.callouts.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.callouts.code.tex index 4cf4b1346b8..72d9761a190 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.callouts.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.callouts.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2018 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.code.tex index ee41b301abc..dace51bf0b3 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % 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 08ef867ff0e..6bc42863239 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 @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau and Mark Wibrow +% Copyright 2018 by Till Tantau and Mark Wibrow % % This file may be distributed and/or modified % 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 fe64c707c1a..4096c3ded85 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 @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2018 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.multipart.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.multipart.code.tex index 2866923c529..481e65094f9 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.multipart.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/shapes/pgflibraryshapes.multipart.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau and Mark Wibrow +% Copyright 2018 by Till Tantau and Mark Wibrow % % This file may be distributed and/or modified % 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 a6e925346d6..7fcba414efb 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 @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau and Mark Wibrow +% Copyright 2018 by Till Tantau and Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/lua/pgf/manual/DocumentParser.lua b/Master/texmf-dist/tex/generic/pgf/lua/pgf/manual/DocumentParser.lua index d2f6780822c..bd2a7026a4a 100644 --- a/Master/texmf-dist/tex/generic/pgf/lua/pgf/manual/DocumentParser.lua +++ b/Master/texmf-dist/tex/generic/pgf/lua/pgf/manual/DocumentParser.lua @@ -159,7 +159,17 @@ local function process_examples(t) local n = {} for i=1,#t do - n[i] = process_string(strip_quotes(t[i])) + local code, options + if type(t[i]) == "table" then + code = assert(t[i].code) + options = t[i].options + else + code = t[i] + end + n[i] = { + options = process_string(strip_quotes(options)), + code = process_string(strip_quotes(code)) + } end return n end @@ -391,8 +401,9 @@ DocumentParser.addRenderer ( print_on_output(output, "\\par\\smallskip\\emph{Example" .. (((#e>1) and "s") or "") .. "}\\par") for _,example in ipairs(e) do - print_on_output(output, "\\begin{codeexample}[]") - print_lines_on_output(output, example) + local opts = table.concat(example.options or {}, "") + print_on_output(output, "\\begin{codeexample}[" .. opts .. "]") + print_lines_on_output(output, example.code) print_on_output(output, "\\end{codeexample}") end end @@ -417,8 +428,12 @@ DocumentParser.addRenderer ( function print_lines_on_output(output, lines) - for _,l in ipairs(lines or {}) do - output[#output+1] = l + for n,l in ipairs(lines or {}) do + if (n == 1 or n == #lines) and l == "" then + -- skip leading and trailing blank lines + else + output[#output+1] = l + end end end 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 fb629421d54..7bfdf58a6c9 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmath.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmath.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 58c51558c8a..bb4d1022e54 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathcalc.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathcalc.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -339,7 +339,7 @@ % \pgfmathpointreflectalongaxis % -% Reflects point #2 around an axis centered on #2 at an angle #3. +% Reflects point #1 around an axis centered on #2 at an angle #3. % \def\pgfmathreflectpointalongaxis#1#2#3{% \pgf@process{% 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 bda29cb51b7..a3a36d82541 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfloat.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfloat.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Christian Feuersaenger +% Copyright 2019 by Christian Feuersaenger % % This file may be distributed and/or modified % @@ -1214,7 +1214,7 @@ fixed zerofill=false,% useless here! sci zerofill=false}% \ifx\pgfmathprintnumber@issci\pgfmathprintnumber@RELATIVE@issci - \pgfmath@error{The '/pgf/number format/every relative' style should set a valid display style}% + \pgfmath@error{The '/pgf/number format/every relative' style should set a valid display style}{}% \fi \let\pgfmathfloat@round@precision@orig=\pgfmathfloat@round@precision \def\pgfmathfloat@round@precision{9999}% @@ -1312,7 +1312,7 @@ % The numerator and denominator is always a number (not empty) \def\pgfmathfloatgetfrac#1{% \pgfutil@ifundefined{pgfmathfloatmultiply@}{% - \pgfmath@PackageError{Sorry, the number format 'frac' requires '\string\usetikzlibrary{fpu}' (and, optionally, \string\usepackage{fp}) in order to work correctly}% + \pgfmath@error{Sorry, the number format 'frac' requires '\string\usetikzlibrary{fpu}' (and, optionally, \string\usepackage{fp}) in order to work correctly}{}% \edef\pgfmathresult{{#1}{0}{1}}% }{% \pgfmathfloatgetfrac@{#1}% @@ -1435,7 +1435,7 @@ \pgfmathfloattofixed\pgfmathresult \pgf@xa=\pgfmathresult pt \multiply\pgf@xa by\pgfmathresultdenom - \edef\pgfmathfloat@scaled@numerator{\pgf@sys@tonumber\pgf@xa}% + \edef\pgfmathfloat@scaled@numerator{\pgfmath@tonumber\pgf@xa}% \expandafter\pgfmathfloat@loc@@to@int\pgfmathfloat@scaled@numerator\relax{\pgfmathresultnumerator}% \fi \ifpgfmathprintnumber@frac@whole diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.base.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.base.code.tex index 9370a219fe3..fcf5503b36b 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.base.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.base.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -109,7 +109,7 @@ \divide\c@pgfmath@counta by\pgfmath@base\relax% \let\pgfmath@next\pgfmathbasetodec@@@% \else - \pgfmath@error{Digit `#1' invalid for base \pgfmath@base}% + \pgfmath@error{Digit `#1' invalid for base \pgfmath@base}{}% \let\pgfmath@next=\relax% \fi% \fi% @@ -245,10 +245,10 @@ \def\pgfmath@checkbase#1{% \ifnum#1<2\relax% - \pgfmath@error{Cannot process numbers in base `#1'.}% + \pgfmath@error{Cannot process numbers in base `#1'.}{}% \else% \ifnum#1>36\relax% - \pgfmath@error{Cannot process numbers in base `#1'.}% + \pgfmath@error{Cannot process numbers in base `#1'.}{}% \fi% \fi} @@ -256,7 +256,7 @@ \expandafter\pgfmath@checknumber@#1\pgfmath@} \def\pgfmath@checknumber@#1#2\pgfmath@{% \ifx#1-% - \pgfmath@error{Cannot process negative numbers.}% + \pgfmath@error{Cannot process negative numbers.}{}% \fi} % \pgfmath@ensurenumberlength diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.basic.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.basic.code.tex index 64dbe2b09a7..1607c386e85 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.basic.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.basic.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -70,7 +70,7 @@ \let\pgfmath@sign=\pgfmath@empty% \ifdim0pt=\pgfmath@y% \pgfmath@error{You've asked me to divide `#1' by `#2', % - but I cannot divide any number by `#2'}% + but I cannot divide any number by `#2'}{}% \fi% \afterassignment\pgfmath@xa% \c@pgfmath@counta\the\pgfmath@y\relax% 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 fc08640e4f3..417ede069dd 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -52,6 +52,7 @@ {\expandafter\noexpand\csname pgfmath#1@\endcsname}% {\csname pgfmath@operation@#1@arity\endcsname}% }% + \pgfkeysvalueof{/pgf/declare function/execute at begin function}% \pgfmath@marshal% } @@ -61,6 +62,7 @@ % #4 - code for function <name>. % \def\pgfmath@@declarefunction#1#2#3#4{% Function of arity 0 - 9. + \pgfkeysvalueof{/pgf/declare function/execute at end function}% \ifcase#3\relax% \def#1{#2}% \def\pgfmath@@head{\def#2}% @@ -109,7 +111,27 @@ \pgfkeys{% /pgf/declare function/.code={% \pgfmath@local@functions#1@=@;% - } + }, + /pgf/declare function/execute at begin function/.initial={}, + /pgf/declare function/execute at end function/.initial={}, + /pgf/declare function/ignore spaces/.is choice, + /pgf/declare function/ignore spaces/.default=true, + /pgf/declare function/ignore spaces/true/.style={% + /pgf/declare function/execute at begin function={% + \begingroup + \catcode`\^^I=9\relax + \catcode`\ =9\relax + \catcode`\~=10\relax + \endlinechar=`\ \relax + }, + /pgf/declare function/execute at end function={% + \endgroup + }, + }, + /pgf/declare function/ignore spaces/false/.style={% + /pgf/declare function/execute at begin function={}, + /pgf/declare function/execute at end function={}, + }, } \def\pgfmath@local@gobbleone#1{} diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.comparison.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.comparison.code.tex index f6e69993e8c..a0632670d8c 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.comparison.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.comparison.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.misc.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.misc.code.tex index bab8fefd4eb..6d1ec5b6ab8 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.misc.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.misc.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % 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 03be2abfd33..66bdd72b71e 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 @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -239,7 +239,7 @@ % #2 - the name of the list. % \def\pgfmathrandomitem#1#2{% - \pgfmath@ifundefined{pgfmath@randomlist@#2}{\pgfmath@error{Unknown random list `#2'}}{% + \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}}} diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.round.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.round.code.tex index 4bd05c18c41..120e971c8c8 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.round.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.round.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.trigonometric.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.trigonometric.code.tex index 76b58bc0f16..b76c5b440ce 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.trigonometric.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathfunctions.trigonometric.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Mark Wibrow +% Copyright 2019 by Mark Wibrow % % This file may be distributed and/or modified % @@ -249,7 +249,7 @@ \begingroup% \pgfmath@x=#1pt % \pgfmath@xa\pgfmath@x% - \edef\pgf@temp{\pgf@sys@tonumber\pgfmath@x}% + \edef\pgf@temp{\pgfmath@tonumber\pgfmath@x}% % compute lossless '*1000' operation: \expandafter\pgfmath@multiply@thousand\pgf@temp 000\relax \pgfmath@x=\pgfmathresult pt % @@ -306,7 +306,7 @@ \begingroup% \pgfmath@x#1pt\relax% \pgfmath@xa\pgfmath@x% - \edef\pgf@temp{\pgf@sys@tonumber\pgfmath@x}% + \edef\pgf@temp{\pgfmath@tonumber\pgfmath@x}% % compute lossless '*1000' operation: \expandafter\pgfmath@multiply@thousand\pgf@temp 000\relax \pgfmath@x=\pgfmathresult pt % @@ -340,7 +340,7 @@ \pgfmath@x\pgfmathresult pt\relax% \fi% % compute lossless '*1000' operation: - \edef\pgf@temp{\pgf@sys@tonumber\pgfmath@x}% + \edef\pgf@temp{\pgfmath@tonumber\pgfmath@x}% \expandafter\pgfmath@multiply@thousand\pgf@temp 000\relax \pgfmath@x=\pgfmathresult pt % \pgfmath@table@lookup{\pgfmath@x}{pgfmath@atan@}{1001}%xxx diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathode.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathode.code.tex index cb3d0d26ca8..f072c2361ef 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathode.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathode.code.tex @@ -1,4 +1,4 @@ -% Copyright 2011 by Christophe Jorssen +% Copyright 2019 by Christophe Jorssen % % This file may be distributed and/or modified % 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 e50dfd615e3..439e62e4370 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathparser.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathparser.code.tex @@ -235,6 +235,16 @@ \pgfmath@tokens@make{dimexpr}{\dimexpr\glueexpr} \fi \pgfmath@tokens@make{unit}{{bp}{cc}{cm}{dd}{em}{ex}{in}{mm}{pc}{pt}{sp}} +\ifx\pdftexversion\@undefined\else % for pdfTeX + \pgfmath@tokens@make{unit}{{nc}{nd}{px}} +\fi +\ifx\directlua\@undefined\else % for LuaTeX + \pgfmath@tokens@make{unit}{{nc}{nd}{px}} +\fi +\ifx\kanjiskip\@undefined\else % for pTeX, upTeX + \pgfmath@tokens@make{unit}{{H}{Q}{zh}{zw}} +\fi +% \pgfmath@tokens@make{mathunit}{{mu}} \pgfmath@tokens@make{numeric}{.0123456789} \pgfmath@tokens@make{number}{0123456789} @@ -460,7 +470,10 @@ \else% \expandafter\ifx\csname pgfmath@token@numeric@\expandafter\string\pgfmath@token\endcsname\relax% % It isn't numeric (i.e., 012345679.), so it might be units... + % first double-character units... \expandafter\ifx\csname pgfmath@token@unit@\pgfmath@token\expandafter\string\pgfmath@token@next\endcsname\relax% + % then single-character units... + \expandafter\ifx\csname pgfmath@token@unit@\pgfmath@token\endcsname\relax% % ...or the exponent characters... \expandafter\ifx\csname pgfmath@token@exponent@\pgfmath@token\endcsname\relax% % ...or a base prefix... @@ -498,7 +511,14 @@ \else% ... and here, it is the exponent characters. \let\pgfmath@parse@next=\pgfmath@parse@exponent% \fi% - \else% ...but here it is units. + \else% ...but here it is single-character units. + \global\pgfmathunitsdeclaredtrue% + \pgfmath@dimen=\pgfmath@number\pgfmath@token\relax% + \edef\pgfmathresult{\pgfmath@tonumber{\pgfmath@dimen}}% + \expandafter\pgfmath@stack@push@operand\expandafter{\pgfmathresult}% + \let\pgfmath@parse@next=\pgfmath@parse@@operator% + \fi% + \else% ...but here it is double-character units. \global\pgfmathunitsdeclaredtrue% \pgfmath@dimen=\pgfmath@number\pgfmath@token\pgfmath@token@next\relax% \edef\pgfmathresult{\pgfmath@tonumber{\pgfmath@dimen}}% diff --git a/Master/texmf-dist/tex/generic/pgf/math/pgfmathutil.code.tex b/Master/texmf-dist/tex/generic/pgf/math/pgfmathutil.code.tex index 49313e88491..d8d67dd8419 100644 --- a/Master/texmf-dist/tex/generic/pgf/math/pgfmathutil.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/math/pgfmathutil.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 Mark Wibrow +% Copyright 2019 Mark Wibrow % % but subject to the LaTeX Project Public License % (http://www.latex-project.org/lppl.txt) 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 d4e82cb1af5..5384b1a71b2 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleanimations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleanimations.code.tex @@ -1,4 +1,4 @@ -% Copyright 2015 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulebending.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulebending.code.tex index 888db712043..d2ffa8b3c50 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulebending.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulebending.code.tex @@ -1,4 +1,4 @@ -% Copyright 2013 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 541c7de8d48..f60764d0be3 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledatavisualization.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledatavisualization.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 8c939d5cb41..f7cdd13457a 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledecorations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduledecorations.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Mark Wibrow and Till Tantau +% Copyright 2019 by Mark Wibrow and Till Tantau % % This file may be distributed and/or modified % 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 4f676aeea47..01f6feee976 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulenonlineartransformations.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulenonlineartransformations.code.tex index 8e607b207d4..55c9d6f6515 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulenonlineartransformations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulenonlineartransformations.code.tex @@ -1,4 +1,4 @@ -% Copyright 2013 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleoo.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleoo.code.tex index 38ceef34cdc..86c1e8e996f 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleoo.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleoo.code.tex @@ -1,5 +1,5 @@ -% Copyright 2006 by Till Tantau -% Copyright 2011 by Saso Zivanovic +% Copyright 2019 by Till Tantau +% Copyright 2019 by Saso Zivanovic % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleparser.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleparser.code.tex index 3ac1aba9fce..ca2a597560b 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleparser.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleparser.code.tex @@ -1,4 +1,4 @@ -% Copyright 2009 by Till Tantau +% Copyright 2019 by Till Tantau % Copyright 2019 by Jonathan P. Spratte % % This file may be distributed and/or modified @@ -19,7 +19,7 @@ % options \long\def\pgfparserset#1% {% - \pgfset{/pgfparser/.cd,#1}% + \pgfqkeys{/pgfparser}{#1}% } \pgfparserset {% diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleplot.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleplot.code.tex index 1a553f925c1..0afea0ae342 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleplot.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleplot.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 166a5d56405..4e8cce59a4b 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulesnakes.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulesnakes.code.tex index 9df6d309801..9b692b1340b 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulesnakes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulesnakes.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulesorting.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulesorting.code.tex index e22bdb09910..9aa1df9fefa 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulesorting.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulesorting.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex b/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex index 86dd7442d22..551b21d9ff0 100644 --- a/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex +++ b/Master/texmf-dist/tex/generic/pgf/pgf.revision.tex @@ -5,10 +5,10 @@ \catcode`\:=12 \catcode`\+=12 \catcode`\-=12 -\gdef\pgfrevision{3.1.5b} -\gdef\pgfversion{3.1.5b} -\gdef\pgfversiondatetime{2020-01-08 10:30:17 +1300} -\gdef\pgfrevisiondatetime{2020-01-08 10:30:17 +1300} +\gdef\pgfrevision{3.1.6} +\gdef\pgfversion{3.1.6} +\gdef\pgfversiondatetime{2020-09-28 18:29:32 +0200} +\gdef\pgfrevisiondatetime{2020-09-28 18:29:32 +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} diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg index 5f7a34c8372..2580bad9d1c 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf-via-dvi.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf-via-dvi.def index d39078338a5..0678b188207 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf-via-dvi.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf-via-dvi.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % CMYK and grayscale shadings adaptation copyright 2019 by David Purton % % This file may be distributed and/or modified 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 c70f3ef2b7f..765ffc84092 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 @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def index 803ed71cdaf..004b8e38f4f 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % CMYK and grayscale shadings adaptation copyright 2019 by David Purton % % This file may be distributed and/or modified @@ -150,10 +150,10 @@ % Opacity \def\pgfsys@fill@opacity#1{% - \pgfsysprotocol@literal{#1 .pgfsetfillopacityalpha} + \pgfsysprotocol@literal{#1 .pgfsetfillopacityalpha}% } \def\pgfsys@stroke@opacity#1{% - \pgfsysprotocol@literal{#1 .pgfsetstrokeopacityalpha} + \pgfsysprotocol@literal{#1 .pgfsetstrokeopacityalpha}% } % Objects diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def index 9dcb2e0e7c9..f1d27290230 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % @@ -891,7 +891,7 @@ \let\pgf@sys@svg@marker@id@start\pgfutil@empty% \else% \global\advance\pgf@sys@svg@objectcount by1\relax% - \edef\pgf@sys@svg@marker@id{pgf\the\pgf@sys@svg@objectcount}% + \edef\pgf@sys@svg@marker@id{pgf\the\pgf@sys@svg@objectcount m}% \edef\pgf@sys@svg@add@code{% \noexpand\pgf@sys@svg@ref@defs{pgfs\pgf@svg@anim@marker@start}% \noexpand\pgfsysprotocol@literal{<marker id="\pgf@sys@svg@marker@id" markerUnits="userSpaceOnUse" orient="auto" overflow="visible"> @@ -904,7 +904,7 @@ \let\pgf@sys@svg@marker@id@end\pgfutil@empty% \else% \global\advance\pgf@sys@svg@objectcount by1\relax% - \edef\pgf@sys@svg@marker@id{pgf\the\pgf@sys@svg@objectcount}% + \edef\pgf@sys@svg@marker@id{pgf\the\pgf@sys@svg@objectcount m}% \edef\pgf@sys@svg@add@code@{% \noexpand\pgf@sys@svg@ref@defs{pgfs\pgf@svg@anim@marker@end}% \noexpand\pgfsysprotocol@literal{<marker id="\pgf@sys@svg@marker@id" markerUnits="userSpaceOnUse" orient="auto" overflow="visible"> diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def index a6397752ff4..dbe6fb31306 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def index 939595089ad..df1209aefb4 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 b2be0c9110b..2c0fc8ae559 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % CMYK and grayscale shadings adaptation copyright 2019 by David Purton % % This file may be distributed and/or modified @@ -314,7 +314,7 @@ \ifx\pgf@imagemask\pgfutil@empty\else\xdef\pgf@imagemask{ /SMask @\pgf@imagemask}\fi% \edef\pgf@image{\noexpand\hbox to \pgf@imagewidth{\vbox to \pgf@imageheight{\vfil\special{pdf:image width \pgf@imagewidth\space height \pgf@imageheight\space\pgf@imagepage\space(\pgf@filename) <<\pgf@imageinterpolate\pgf@imagemask\space>>}}\hfil}}% } -\def\pgfsys@definemask#1{% +\def\pgfsys@definemask{% \ifx\pgf@maskmatte\pgfutil@empty% \else% \edef\pgf@maskmatte{/Matte [\pgf@maskmatte]}% @@ -450,6 +450,7 @@ % Transparency groups came from pgfsys-pdftex.def \def\pgfsys@transparencygroupfrombox#1{% {% + \pgfutil@tempdima=\pgf@picminx \pgf@sys@bp@correct\pgf@picminx% \pgf@sys@bp@correct\pgf@picmaxx% \pgf@sys@bp@correct\pgf@picminy% @@ -459,7 +460,7 @@ \wd#1=0pt% \ht#1=0pt% \dp#1=0pt% - \hskip\pgf@picminx bp\box#1\hskip-\pgf@picminx bp% + \hskip\pgfutil@tempdima\box#1\hskip-\pgfutil@tempdima% \special{pdf:put @resources << \ifpgf@sys@pdf@extgs@exists /ExtGState @pgfextgs \fi diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def index 4cb4d51b8b0..70f5ba28873 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def @@ -1,4 +1,7 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau +% +% PS-3 shadings, image and opacity masks (fadings), transparency groups, +% blend modes copyright 2020 by Alexander Grahn % % This file may be distributed and/or modified % @@ -33,9 +36,9 @@ \pgfsys@begin@idscope% \pgfsys@invoke{pgfs}% \special{ps::[end]}% - \wd#1=0pt% - \ht#1=0pt% - \dp#1=0pt% + \wd#1=0pt + \ht#1=0pt + \dp#1=0pt \box#1 \special{ps::[begin]}% \pgfsys@invoke{pgfr}% @@ -79,13 +82,36 @@ /pgfc{newpath @endspecial pgfpd}bind def %close /pgfsd{globaldict /pgfdelta /delta where {pop delta} {0} ifelse put}bind def% save delta /pgfpd{/delta globaldict /pgfdelta get def}bind def % put delta - /.setopacityalpha where {pop} {/.setopacityalpha{pop}def} ifelse % install .setopacityalpha + /.setblendmode where {pop} {/.setblendmode{pop}def} ifelse % install .setblendmode + /.setfillconstantalpha where {% + pop /.setopacityalpha {.setfillconstantalpha} def% + } {% + /.setopacityalpha where {pop} {/.setopacityalpha {pop} def} ifelse% install .setopacityalpha (fallback) + } ifelse /.pgfsetfillopacityalpha{/pgffoa exch def - /pgffill{gsave pgffoa .setopacityalpha fill 1 .setopacityalpha newpath fill grestore newpath}bind def - /pgfeofill{gsave pgffoa .setopacityalpha eofill 1 .setopacityalpha newpath eofill grestore newpath}bind def}bind def - /.pgfsetstrokeopacityalpha{/pgfsoa exch def /pgfstr{gsave pgfsoa .setopacityalpha stroke grestore newpath}bind def}bind def + /.setfillconstantalpha where {pop pgffoa .setfillconstantalpha} {% + /pgffill{gsave pgffoa .setopacityalpha fill 1 .setopacityalpha newpath fill grestore newpath}bind def + /pgfeofill{gsave pgffoa .setopacityalpha eofill 1 .setopacityalpha newpath eofill grestore newpath}bind def% + } ifelse% + } bind def + /.pgfsetstrokeopacityalpha{/pgfsoa exch def + /.setstrokeconstantalpha where {pop pgfsoa .setstrokeconstantalpha} {% + /pgfstr{gsave pgfsoa .setopacityalpha stroke grestore newpath}bind def% + } ifelse% + }bind def /pgffoa 1 def /pgfsoa 1 def + % mandatory, transparency-related per-page operations, see + % https://www.ghostscript.com/doc/current/Language.htm#Transparency + % (bop-hook & eop-hook automatically executed if defined in userdict, see texdoc dvips) + /.pushpdf14devicefilter where {pop + [userdict /bop-hook known {userdict /bop-hook get aload pop} if + {0 .pushpdf14devicefilter} aload pop] cvx userdict exch /bop-hook exch put + [userdict /eop-hook known {userdict /eop-hook get aload pop} if + {.poppdf14devicefilter} aload pop] cvx userdict exch /eop-hook exch put% + } if + % keeps printers from choking on pdfmark operator + systemdict /pdfmark known not {userdict /pdfmark systemdict /cleartomark get put} if end }% } @@ -138,6 +164,467 @@ \fi + +% Path usage: +\def\pgfsys@discardpath{% + \ifpgfsys@@clipnext% + \ifpgfsys@eorule% + \pgfsysprotocol@literal{% + /pgfsmaskinplace dup where {exch get}{pop false} ifelse not {eoclip} if}% + \else% + \pgfsysprotocol@literal{% + /pgfsmaskinplace dup where {exch get}{pop false} ifelse not {clip} if}% + \fi% + \pgfsys@@clipnextfalse% + \fi% + \pgfsysprotocol@literal{newpath}} + + +% +% Blending +% + +\def\pgfsys@blend@mode#1{% + \expandafter\ifx\csname pgf@sys@pdf@bm@#1\endcsname\relax% + \expandafter\let\expandafter\pgf@temp\csname pgf@sys@pdf@blend@mode@map@#1\endcsname% + \expandafter\xdef\csname pgf@sys@pdf@bm@#1\endcsname{/\pgf@temp}% + \ifx\pgf@temp\relax% + \pgferror{Unknown blend mode '#1'}% + \def\pgf@temp{Normal}% + \fi% + \fi% + \pgfsysprotocol@literal{\csname pgf@sys@pdf@bm@#1\endcsname\space .setblendmode}% +} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@normal\endcsname{Normal} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@multiply\endcsname{Multiply} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@screen\endcsname{Screen} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@overlay\endcsname{Overlay} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@darken\endcsname{Darken} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@lighten\endcsname{Lighten} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@color dodge\endcsname{ColorDodge} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@color burn\endcsname{ColorBurn} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@hard light\endcsname{HardLight} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@soft light\endcsname{SoftLight} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@difference\endcsname{Difference} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@exclusion\endcsname{Exclusion} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@saturation\endcsname{Saturation} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@color\endcsname{Color} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@hue\endcsname{Hue} +\expandafter\def\csname pgf@sys@pdf@blend@mode@map@luminosity\endcsname{Luminosity} + + +% +% Shadings +% + +\def\pgfsys@horishading#1#2#3{% + {% + \pgf@parsefunc{#3}% + \pgf@xb=\pgf@max + \pgfmathsetlength\pgf@y{#2}% + \pgf@yb=\pgf@y + \pgf@sys@bp@correct{\pgf@xb}% + \pgf@sys@bp@correct{\pgf@yb}% + \xdef\pgfutil@tempa{\hbox to \the\pgf@max{% + \noexpand\vrule width0pt height\the\pgf@y% + \noexpand\pgfsys@beginpurepicture% + \noexpand\pgfsys@outerinvoke{ + \pgf@sys@tonumber{\pgf@yb} \pgf@sys@tonumber{\pgf@xb} 0 0 pgfe << + /PatternType 2 + /Shading << + /ShadingType 2 + /ColorSpace \pgf@shading@device\space + /Domain [\pgf@pdfparseddomain] + /Coords [\pgf@doma\space0 \pgf@domb\space0] + /Function \pgf@pdfparsedfunction + >> + >> matrix makepattern setpattern fill + }% + \hss% + \noexpand\pgfsys@endpurepicture% + }}% + }% + \global\expandafter\let\csname @pgfshading#1!\endcsname\pgfutil@tempa% +} +\def\pgfsys@vertshading#1#2#3{% + {% + \pgf@parsefunc{#3}% + \pgfmathsetlength\pgf@x{#2}% + \pgf@xb=\pgf@x + \pgf@yb=\pgf@max + \pgf@sys@bp@correct{\pgf@xb}% + \pgf@sys@bp@correct{\pgf@yb}% + \xdef\pgfutil@tempa{\hbox to \the\pgf@x{% + \noexpand\vrule width0pt height\the\pgf@max% + \noexpand\pgfsys@beginpurepicture% + \noexpand\pgfsys@outerinvoke{ + \pgf@sys@tonumber{\pgf@yb} \pgf@sys@tonumber{\pgf@xb} 0 0 pgfe << + /PatternType 2 + /Shading << + /ShadingType 2 + /ColorSpace \pgf@shading@device\space + /Domain [\pgf@pdfparseddomain] + /Coords [0 \pgf@doma\space0 \pgf@domb] + /Function \pgf@pdfparsedfunction + >> + >> matrix makepattern setpattern fill + }% + \hss% + \noexpand\pgfsys@endpurepicture% + }}% + }% + \global\expandafter\let\csname @pgfshading#1!\endcsname\pgfutil@tempa% +} +\def\pgfsys@radialshading#1#2#3{% + {% + \pgf@parsefunc{#3}% + \pgf@process{#2}% + \pgf@xa=\pgf@x + \pgf@ya=\pgf@y + \pgf@process{\pgfpoint{\pgf@max}{\pgf@max}}% + \advance\pgf@xa by \pgf@x + \advance\pgf@ya by \pgf@y + \pgf@sys@bp@correct{\pgf@x}% + \pgf@sys@bp@correct{\pgf@y}% + \pgf@sys@bp@correct{\pgf@xa}% + \pgf@sys@bp@correct{\pgf@ya}% + \pgf@max=2\pgf@max + \xdef\pgfutil@tempa{\hbox to \the\pgf@max{% + \noexpand\vrule width0pt height\the\pgf@max% + \noexpand\pgfsys@beginpurepicture% + \noexpand\pgfsys@outerinvoke{ + << + /ShadingType 3 + /ColorSpace \pgf@shading@device\space + /Domain [\pgf@pdfparseddomain] + /Coords [\pgf@sys@tonumber{\pgf@xa} \pgf@sys@tonumber{\pgf@ya} \pgf@doma\space + \pgf@sys@tonumber{\pgf@x} \pgf@sys@tonumber{\pgf@y} \pgf@domb] + /Function \pgf@pdfparsedfunction + /Extend [true false] + >> shfill + }% + \hss% + \noexpand\pgfsys@endpurepicture% + }}% + }% + \global\expandafter\let\csname @pgfshading#1!\endcsname\pgfutil@tempa% +} +\def\pgfsys@functionalshading#1#2#3#4{% + {% + \pgf@process{#2}% + \pgf@xa=\pgf@x + \pgf@ya=\pgf@y + \pgf@process{#3}% + \pgf@xb=\pgf@x + \pgf@yb=\pgf@y + \advance\pgf@x by-\pgf@xa + \advance\pgf@y by-\pgf@ya + \pgf@sys@bp@correct{\pgf@xa}% + \pgf@sys@bp@correct{\pgf@ya}% + \pgf@sys@bp@correct{\pgf@xb}% + \pgf@sys@bp@correct{\pgf@yb}% + \pgf@xc=-\pgf@xa + \pgf@yc=-\pgf@ya + \xdef\pgfutil@tempa{% + \hbox to\the\pgf@x{\vbox to\the\pgf@y{\vfil + \noexpand\pgfsys@beginpurepicture% + \noexpand\pgfsys@invoke{% + % patch coords + /pgfpatchllx \pgf@sys@tonumber{\pgf@xa} def + /pgfpatchlly \pgf@sys@tonumber{\pgf@ya} def + % shading patch width and height + /pgfpatchX \pgf@sys@tonumber{\pgf@xb} pgfpatchllx sub def + /pgfpatchY \pgf@sys@tonumber{\pgf@yb} pgfpatchlly sub def + % number of samples in each direction (with samples spaced by approx. 1bp) + /pgfsamplesx pgfpatchX round cvi 1 add def + /pgfsamplesy pgfpatchY round cvi 1 add def + % exact sample distance in each direction, in bp + /pgfpatchdx pgfpatchX pgfsamplesx 1 sub div def + /pgfpatchdy pgfpatchY pgfsamplesy 1 sub div def + % + pgfpatchllx neg pgfpatchlly neg translate + /pgfproc {#4} bind def + % + % sampling procedure; repeatedly called by /ReusableStreamDecode filter; + % on each call, /pgfsamplingproc puts one colour sample (rgb, cmyk or gray) + % on the operand stack which is then consumed by the filter + userdict /pgfsampleidx 0 put % internal index; updated on each call + /pgfsamplingproc { + pgfsampleidx pgfsamplesx pgfsamplesy mul eq { + () % push empty string on the stack to signal end-of-data + } { + pgfcolorsample\pgf@shading@model\space % -str- + pgfsampleidx pgfsamplesx mod pgfpatchdx mul pgfpatchllx add % -str- x + pgfsampleidx pgfsamplesx idiv pgfpatchdy mul pgfpatchlly add % -str- x y + pgfproc % -str- <colour> + pgfwritesample\pgf@shading@model\space % -str- + /pgfsampleidx pgfsampleidx 1 add store % (update index) + } ifelse + } bind def + % + pgfpatchY pgfpatchX pgfpatchllx pgfpatchlly pgfe << + /PatternType 2 + /Shading << + /ShadingType 1 + /Domain [0 1 0 1] + /Matrix [pgfpatchX 0 0 pgfpatchY pgfpatchllx pgfpatchlly] + /ColorSpace \pgf@shading@device\space + /Function << + /FunctionType 0 + /Order 1 + /Domain [0 1 0 1] + /Range pgfrange\pgf@shading@model + /BitsPerSample pgfchanneldepth\pgf@shading@model % bits per channel, actually + /Size [pgfsamplesx pgfsamplesy] + /DataSource /pgfsamplingproc load /ReusableStreamDecode filter + >> + >> + >> matrix makepattern setpattern fill + }% + \noexpand\pgfsys@endpurepicture% + }\hss}% + }% + }% + \global\expandafter\let\csname @pgfshading#1!\endcsname\pgfutil@tempa% +} + +% helpers for converting FunctionType-4 to FunctionType-0, i. e. sampled, functions; +% FunctionType-4 functions are not defined in PostScript-3 +% +% These are the different colour models we are going to use: +% +-------+-------------------+-----------+------------------+ +% | model | channel depth/bit | max value | sample size/byte | +% +-------+-------------------+-----------+------------------+ +% | cmyk | 8 | 255 | 4 | +% | rgb | 8 | 255 | 3 | +% | gray | 24 | 16777215 | 3 | +% +-------+-------------------+-----------+------------------+ +\expandafter\gdef\expandafter\pgfsys@atbegindocument\expandafter{\pgfsys@atbegindocument% + \pgf@sys@postscript@header{ + % + % -str- c m y k pgfwritesamplecmyk ==> -str- + % -str- r g b pgfwritesamplergb ==> -str- + % -str- gray pgfwritesamplegray ==> -str- + % writes a single colour sample into the /pgfcolorsample* string; + % colour components (c,m,y,k; r,g,b; gray) between 0.0 to 1.0 + % + /pgfwritesamplecmyk { + 4 index 0 5 index pgfcheckcolorrange 255 mul round cvi put + 4 index 1 4 index pgfcheckcolorrange 255 mul round cvi put + 4 index 2 3 index pgfcheckcolorrange 255 mul round cvi put + 4 index 3 2 index pgfcheckcolorrange 255 mul round cvi put + pop pop pop pop + } bind def + % + /pgfwritesamplergb { + 3 index 0 4 index pgfcheckcolorrange 255 mul round cvi put + 3 index 1 3 index pgfcheckcolorrange 255 mul round cvi put + 3 index 2 2 index pgfcheckcolorrange 255 mul round cvi put + pop pop pop + } bind def + % + /pgfwritesamplegray { + % grayvalue between 0 and 16777215 (24 bit) + pgfcheckcolorrange 16777215 mul round cvi % -str- gray24 + 1 index 0 2 index -16 bitshift put % high byte + 1 index 1 2 index 65535 and -8 bitshift put % middle byte + 1 index 2 2 index 255 and put % low byte + pop + } bind def + % + % <colour component> pgfcheckcolorrange ==> <something between 0.0 and 1.0> + % truncates value to the allowed range (user-defined Type-4 functions may + % happen to provide values outside this range) + /pgfcheckcolorrange { + dup 0.0 lt {pop 0.0} if + dup 1.0 gt {pop 1.0} if + } bind def + % + %colour depths per channel (bit) + /pgfchanneldepthcmyk 8 def + /pgfchanneldepthrgb 8 def + /pgfchanneldepthgray 24 def + % + % allocate strings as buffers for storing a single colour sample + /pgfcolorsamplecmyk 4 string def + /pgfcolorsamplergb 3 string def + /pgfcolorsamplegray 3 string def + % + %/Range array in the FunctionType 0 dictionary + /pgfrangecmyk [0 1 0 1 0 1 0 1] def + /pgfrangergb [0 1 0 1 0 1] def + /pgfrangegray [0 1] def + }% +} + + +% +% Opacity masks +% + +\def\pgfsys@fadingfrombox#1#2{% + \ifcsname pgfsmaskxform@#1\endcsname + \pgfwarning{Fading '#1' already defined.\MessageBreak Going to replace it with new definition}% + \fi% + \global\advance\pgf@objectcount\@ne% + {% + \pgf@x=-.5\wd#2% + \pgf@y=-.5\ht#2% + \advance\pgf@y by.5\dp#2% + \expandafter\xdef\csname pgfsmasktrans@#1\endcsname{% + \noexpand\pgftransformcm{1}{0}{0}{1}{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}}% + \edef\@tempa{\noexpand\pgfutil@insertatbegincurrentpagefrombox{% + % box coordinates (reference point and top) needed for distilling + \pgfsys@outerinvoke{currentpoint /pgf@refy exch def /pgf@refx exch def}% + \hbox to 0pt {\hbox to \ifdim\ht#2>\ht\strutbox\ht#2\else\ht\strutbox\fi{\hss\pgfsys@outerinvoke{% + /pgf@top pgf@refy currentpoint pop pgf@refx sub VResolution Resolution div mul sub def% + }}\hss}% + \pgfsys@outerinvoke{gsave + % translate box to upper left page corner, so we have the whole clipping path (i. e. + % page area) available for distilling, as outlying parts get clipped + clippath pathbbox newpath pop pop translate pgf@refx neg pgf@top neg translate + % translate origin (0,0) to the reference point + gsave pgf@refx pgf@refy translate + mark /_objdef {pgfsmaskxform@\the\pgf@objectcount} + /BBox [clippath pathbbox newpath] /BP pdfmark grestore% + }% + \wd#2=0pt + \ht#2=0pt + \dp#2=0pt + \box#2% + \pgfsys@outerinvoke{mark /EP pdfmark grestore}% + }}\@tempa% + \expandafter\xdef\csname pgfsmaskxform@#1\endcsname{\the\pgf@objectcount}% + }% +} +\def\pgfsys@usefading#1#2#3#4#5#6#7{% + \ifcsname pgfsmaskxform@#1\endcsname% + {% + \pgftransformreset% + \pgftransformcm{#2}{#3}{#4}{#5}{\pgfpoint{#6}{#7}}% + \csname pgfsmasktrans@#1\endcsname% + {% + \pgflowlevelsynccm% + \pgfsys@outerinvoke{% + /.begintransparencymaskgroup where {pop + /pgf@sys@currentcolorspace currentcolorspace def + /pgf@sys@currentcolor [currentcolor] cvx def + /pgf@sys@OverrideICC currentuserparams /OverrideICC get def % Chr. Liddell + <</OverrideICC true>> setuserparams % of Artifex + /DeviceGray setcolorspace + true <</Subtype/Luminosity>> clippath pathbbox newpath .begintransparencymaskgroup + gsave + 72 Resolution div 72 VResolution div scale + 1 DVImag div 1 DVImag div neg scale + mark {pgfsmaskxform@\csname pgfsmaskxform@#1\endcsname} /SP pdfmark + grestore + 0 .endtransparencymask + <</OverrideICC pgf@sys@OverrideICC>> setuserparams % restore orig. settings + pgf@sys@currentcolorspace setcolorspace + pgf@sys@currentcolor setcolor + /pgfsmaskinplace true def + } if% + }% + }% + \pgftransforminvert% + \pgflowlevelsynccm% + }% + \else + \pgferror{Undefined fading '#1'}% + \fi% +} +\def\pgfsys@clipfading{% + \pgfsyssoftpath@invokecurrentpath% + \pgfsys@clipnext% + \pgfsys@discardpath% +} + + +% +% Transparency groups +% +\def\pgfsys@transparencygroupfrombox#1{% + \global\advance\pgf@objectcount\@ne% + \pgfsys@outerinvoke{% + mark /_objdef {pgfxform@\the\pgf@objectcount} /BBox [clippath pathbbox newpath] /BP pdfmark + gsave + /pgf@sys@foa pgffoa def /pgf@sys@soa pgfsoa def + /.setstrokeconstantalpha where + {pop 1 .pgfsetfillopacityalpha 1 .pgfsetstrokeopacityalpha} if% + }% + \wd#1=0pt + \ht#1=0pt + \dp#1=0pt + \hskip\pgf@picminx\box#1% + \pgfsys@outerinvoke{% + /pgffoa pgf@sys@foa def /pgfsoa pgf@sys@soa def + grestore + mark /EP pdfmark + mark {pgfxform@\the\pgf@objectcount} << /Group << /S /Transparency + /I \ifpgfsys@transparency@group@isolated true \else false \fi + /K \ifpgfsys@transparency@group@knockout true \else false \fi >> >> /PUT pdfmark% + }% + \setbox#1=\hbox{\pgfsys@outerinvoke{mark {pgfxform@\the\pgf@objectcount} /SP pdfmark}}% +} + + +% +% Image inclusion, adding SMask reference and image interpolation if mandated +% + +\def\pgfsys@defineimage{% + \ifx\pgf@imagewidth\pgfutil@empty\else\edef\pgf@imagewidth{width=\pgf@imagewidth,}\fi% + \ifx\pgf@imageheight\pgfutil@empty\else\edef\pgf@imageheight{height=\pgf@imageheight,}\fi% + \begingroup% + \def\pgf@imageaddedkeys{}\def\@tempa{true}% + \ifx\pgf@imageinterpolate\@tempa\def\pgf@imageaddedkeys{/Interpolate true}\fi% + \ifx\pgf@imagemask\pgfutil@empty\else\edef\pgf@imageaddedkeys{\pgf@imageaddedkeys /SMask {\pgf@imagemask}}\fi% + \edef\@tempa{% + \ifx\pgf@imageaddedkeys\pgfutil@empty\else% + \noexpand\pgfsys@outerinvoke{% + save /pgfparent [(img) cvx cvn rand] cvx def %random name for current image + mark /_objdef /pgfparent load /NI pdfmark + % sometimes, image metadata contain embedded pdfmarks that prevent us from + % writing to the image dictionary ourselves, so we disable them temporarily + save /pdfmark /cleartomark load def + }% + \fi% + \noexpand\includegraphics[\pgf@imageheight\pgf@imagewidth]{\pgf@filename}% + \ifx\pgf@imageaddedkeys\pgfutil@empty\else% + \noexpand\pgfsys@outerinvoke{% + % empty image dummy, in case the provided file is not a valid raster image + 0 0 1 [1 0 0 1 0 0] {} image restore + mark /pgfparent load <<\pgf@imageaddedkeys>> /PUT pdfmark restore + }% + \fi% + }% + \expandafter\endgroup% + \expandafter\def\expandafter\pgf@image\expandafter{\@tempa}% +} + + +% +% Image masks +% + +\def\pgfsys@definemask{% + \global\advance\pgf@objectcount\@ne% + \ifx\pgf@maskmatte\pgfutil@empty% + \else% + \edef\pgf@maskmatte{/Matte [\pgf@maskmatte]}% + \fi% + \pgfsys@outerinvoke{% + mark /_objdef {pgfmask\the\pgf@objectcount} /NI pdfmark + 1 dict begin /pdfmark /cleartomark load def + }% + \special{psfile=\pgf@filename\space hsize=0 vsize=0}% + \pgfsys@outerinvoke{% + 0 0 1 [1 0 0 1 0 0] {} image + end mark {pgfmask\the\pgf@objectcount} <</Decode [1 0] \pgf@maskmatte>> /PUT pdfmark + }% + \edef\pgf@mask{pgfmask\the\pgf@objectcount}% +} + \endinput %%% Local Variables: diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm.def index f817f508740..a0896011828 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm4ht.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm4ht.def new file mode 100644 index 00000000000..2853147a8d1 --- /dev/null +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvisvgm4ht.def @@ -0,0 +1,70 @@ +% Copyright 2020 by Michal Hoftich +% Copyright 2006 by Till Tantau +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. +% +% See the file doc/generic/pgf/licenses/LICENSE for more details. + +\ProvidesFileRCS{pgfsys-dvisvgm4ht.def} + +% Driver commands for tex4ht + +% +% Load common pdf commands: +% + %\input pgfsys-dvisvgm.def +\input pgfsys-dvips.def + + + +\AtBeginDocument{ + % configure the output picture format to svg + \Configure{Picture}{.svg} + % insert tex4ht hook to the code used at the start and end of each TikZ picture + \def\pgfsys@beginpicture{% + \bgroup% + \ifdefined\inside@pict@cmd% handle nested uses + \def\run@pict@cmd{}% insert the \Picture hooks only in the top nesting level + \def\end@pict@cmd{}% + \else + % use different version of \Picture depending on the vertical mode + \ifvmode\def\run@pict@cmd{\Picture*}\else\def\run@pict@cmd{\Picture+}\fi% + \def\end@pict@cmd{\EndPicture}% + \fi% + % command used to detect nesting + \def\inside@pict@cmd{}% + \csname a:tikzpicture\endcsname% + \orig@pgfsys@begin% + }% + \def\pgfsys@endpicture{% + \orig@pgfsys@end% + \csname b:tikzpicture\endcsname% + \egroup% + \par% + }% +} + + +% Make the code inserted by tex4ht configurable + +\NewConfigure{tikzpicture}{2} +\Configure{tikzpicture}{% + % \ifvmode\IgnorePar\fi\EndP%\HtmlParOff + \protect\csname nested:math\endcsname% support display math + \run@pict@cmd{}% +}{\end@pict@cmd} + +\let\orig@pgfsys@begin\pgfsys@beginpicture +\let\orig@pgfsys@end\pgfsys@endpicture +\def\pgf@sys@postscript@header#1{{\special{! #1}}} + + +\endinput + + +%%% Local Variables: +%%% mode: latex +%%% End: 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 a0b63c1cace..88adfd42d9d 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-luatex.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-luatex.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % CMYK and grayscale shadings adaptation copyright 2019 by David Purton % % This file may be distributed and/or modified @@ -71,7 +71,7 @@ \edef\pgf@image{\noexpand\useimageresource\the\lastsavedimageresourceindex}% \fi }% -\def\pgfsys@definemask#1{% +\def\pgfsys@definemask{% \ifx\pgf@maskmatte\pgfutil@empty% \else% \edef\pgf@maskmatte{/Matte [\pgf@maskmatte]}% @@ -289,7 +289,7 @@ \pgferror{Undefined fading '#1'}% \else% {% - \expandafter\ifx\csname pgfsmaks@#1\endcsname\relax% + \expandafter\ifx\csname pgfsmask@#1\endcsname\relax% \pgf@sys@pdf@install@mask{#1}% \fi% \pgftransformreset% 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 b74e005a757..3654670e67c 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % CMYK and grayscale shadings adaptation copyright 2019 by David Purton % % This file may be distributed and/or modified @@ -68,7 +68,7 @@ \edef\pgf@image{\noexpand\pdfrefximage\the\pdflastximage}% \fi }% -\def\pgfsys@definemask#1{% +\def\pgfsys@definemask{% \ifx\pgf@maskmatte\pgfutil@empty% \else% \edef\pgf@maskmatte{/Matte [\pgf@maskmatte]}% @@ -286,7 +286,7 @@ \pgferror{Undefined fading '#1'}% \else% {% - \expandafter\ifx\csname pgfsmaks@#1\endcsname\relax% + \expandafter\ifx\csname pgfsmask@#1\endcsname\relax% \pgf@sys@pdf@install@mask{#1}% \fi% \pgftransformreset% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def index 1f8c09d0c10..44dd1ae5b09 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 1a01a6f8f11..01f7cd9fb95 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 cce6e4a3444..6bb0c71595c 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-xetex.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-xetex.def index 5147214ef9b..ce08194ce1c 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-xetex.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-xetex.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % @@ -62,7 +62,11 @@ \pgf@marshal% } -\def\pgf@sys@pdf@mark@pos@pgfpageorigin{\pgfqpoint{2\hoffset}{0pt}} +\ifnum\the\XeTeXversion\expandafter\pgfutil@gobble\XeTeXrevision>0999991\relax + \def\pgf@sys@pdf@mark@pos@pgfpageorigin{\pgfqpoint{\hoffset}{\voffset}} +\else + \def\pgf@sys@pdf@mark@pos@pgfpageorigin{\pgfqpoint{2\hoffset}{0pt}} +\fi \ifx\paperheight\@undefined \else 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 e3e8a5ff833..000eef098c2 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % @@ -862,6 +862,11 @@ % state. Parameters #2 to #7 specify a transformation cm that should % be applied to the mask before it is used. +\def\pgfsys@clipfading{} +% This default implementation is a no-op for all drivers except `dvips' +% where we have to set the clipping path _before_ installing the fading (used in +% \pgfsetfadingforcurrentpath, \pgfsetfadingforcurrentpathstroked commands of +% the basic layer) % 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 06bd9934bff..49ba41bfc63 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysanimations.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysanimations.code.tex @@ -1,4 +1,4 @@ -% Copyright 2016 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex index 3625abbb576..32052b8a292 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex index d04eb022885..9fe3f1e7db5 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 89ee8963e92..579b6dccea3 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfcalendar.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfcalendar.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfexternal.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfexternal.tex index 7be11f8f0e2..7f9c4a0293a 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfexternal.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfexternal.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfexternalwithdepth.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfexternalwithdepth.tex index f2b08b2a9e4..907083ef3be 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfexternalwithdepth.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfexternalwithdepth.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 4e351c902be..cdb77b31377 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Till Tantau and Mark Wibrow +% Copyright 2019 by Till Tantau and Mark Wibrow % % This file may be distributed and/or modified % @@ -727,7 +727,7 @@ } \def\pgffor@remember@parse@old#1#2\pgffor@stop{% - \pgffor@remember@@parse@old#1#2\pgffor@stop as#1(initially )\pgffor@@stop} + \pgffor@remember@@parse@old#1#2\pgffor@stop as#1(initially 0)\pgffor@@stop} \def\pgffor@remember@@parse@old#1#2as#3#4\pgffor@@stop{% \pgffor@remember@@@parse@old{#1}{#3}#2#4\pgffor@stop\pgffor@@stop} @@ -735,11 +735,7 @@ \def\pgffor@remember@@@parse@old#1#2#3(initially #4)#5\pgffor@stop#6\pgffor@@stop{% \pgfutil@append@tomacro{\pgffor@assign@after@code}{\edef#2{#1}}% \pgfutil@append@tomacro{\pgffor@remember@code}{\noexpand\def\noexpand#2{#2}}% - \def\pgffor@test{#4}% - \ifx\pgffor@test\pgfutil@empty% - \else% - \pgfutil@append@tomacro{\pgffor@assign@once@code}{\def#2{#4}}% - \fi% + \pgfutil@append@tomacro{\pgffor@assign@once@code}{\def#2{#4}}% } \def\pgffor@count@parse#1#2\pgffor@stop{% 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 73922a0f097..e32745317c5 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex @@ -1,4 +1,4 @@ -% Copyright 2007 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % @@ -24,6 +24,8 @@ % works with all TeX formats and has no save-stack impact \def\pgfkeys@empty{} +\long\def\pgfkeys@firstoftwo#1#2{#1} +\long\def\pgfkeys@secondoftwo#1#2{#2} % This is useful: @@ -43,8 +45,6 @@ \csname @@end\expandafter\endcsname\expandafter\end% \fi -\expandafter\let\expandafter\pgfkeys@ifcsname\csname ifcsname\endcsname% - % Set a key to a value % % #1 = key @@ -178,7 +178,7 @@ % % \pgfkeysifdefined{/tikz/length}{key exists}{does not exist} -\long\def\pgfkeysifdefined#1#2#3{\pgfkeys@ifcsname pgfk@#1\endcsname#2\else#3\fi} +\long\def\pgfkeysifdefined#1#2#3{\ifcsname pgfk@#1\endcsname#2\else#3\fi} % Tests whether a key is assignable. For standard keys which just % store their value, this is identical to \pgfkeysifdefined. @@ -420,7 +420,7 @@ \def\pgfkeys@ifexecutehandler#1#2{#1}% \let\pgfkeys@ifexecutehandler@handleall=\pgfkeys@ifexecutehandler \def\pgfkeys@ifexecutehandler@handleonlyexisting#1#2{% - \pgfkeys@ifcsname pgfk@excpt@\pgfkeyscurrentname\endcsname% + \ifcsname pgfk@excpt@\pgfkeyscurrentname\endcsname% #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: @@ -431,7 +431,7 @@ }% \def\pgfkeys@ifexecutehandler@handlefullorexisting#1#2{% \ifpgfkeysaddeddefaultpath - \pgfkeys@ifcsname pgfk@excpt@\pgfkeyscurrentname\endcsname% + \ifcsname pgfk@excpt@\pgfkeyscurrentname\endcsname% #1% ok, this particular key handler is known and be processed in any case (for example .try) \else % implement the 'only existing' feature here: @@ -719,7 +719,11 @@ % (with expansion of '#1'): \edef\pgfkeys@tempargs{\noexpand\pgfkeysvalueof{#1/.@@body}}% \def\pgfkeys@temp{\pgfkeysdef{#1}}% - \expandafter\pgfkeys@temp\expandafter{\pgfkeys@tempargs##1}% + \ifnum#2=1\relax + \expandafter\pgfkeys@temp\expandafter{\pgfkeys@tempargs{##1}}% + \else + \expandafter\pgfkeys@temp\expandafter{\pgfkeys@tempargs##1}% + \fi #5{#1/.@body}{#3}% } @@ -795,7 +799,11 @@ % Defining a value -\pgfkeys{/handlers/.initial/.code=\pgfkeyssetvalue{\pgfkeyscurrentpath}{#1}} +\pgfkeys{/handlers/.initial/.code=% + \pgfkeyslet{\pgfkeyscurrentpath/.@cmd}\undefined + \pgfkeyslet{\pgfkeyscurrentpath/.@args}\undefined + \pgfkeyssetvalue{\pgfkeyscurrentpath}{#1}% +} \pgfkeys{/handlers/.add/.code 2 args=\pgfkeysaddvalue{\pgfkeyscurrentpath}{#1}{#2}} \pgfkeys{/handlers/.prefix/.code=\pgfkeysaddvalue{\pgfkeyscurrentpath}{#1}{}} \pgfkeys{/handlers/.append/.code=\pgfkeysaddvalue{\pgfkeyscurrentpath}{}{#1}} @@ -828,7 +836,7 @@ }% } \def\pgfkeys@handle@boolean#1#2{% - \pgfkeys@ifcsname#1#2\endcsname% + \ifcsname#1#2\endcsname% \csname#1#2\endcsname% \else% \def\pgf@marshal{\pgfkeysvalueof{/errors/boolean expected/.@cmd}}% @@ -895,10 +903,17 @@ \pgfkeys@searchalso@parse#1,\pgfkeys@mainstop {% \toks0=\expandafter{\pgfkeys@global@temp##1\pgfeov}% - \toks1={\pgfkeysalso{/handlers/.unknown/.@cmd/.expand once=\pgfkeys@searchalso@temp@value}}% + \toks1={% + \pgfkeysgetvalue{/handlers/.unknown/.@cmd}{\pgfkeys@code}% + \expandafter\pgfkeys@code\pgfkeys@searchalso@temp@value\pgfeov + }% \xdef\pgfkeys@global@temp{% \noexpand\def\noexpand\pgfkeys@searchalso@temp@value{####1}% \noexpand\ifpgfkeysaddeddefaultpath + \noexpand\expandafter\noexpand\pgfkeys@firstoftwo + \noexpand\else + \noexpand\expandafter\noexpand\pgfkeys@secondoftwo + \noexpand\fi{% \noexpand\pgfkeyssuccessfalse \noexpand\let\noexpand\pgfkeys@searchalso@name=\noexpand\pgfkeyscurrentkeyRAW \the\toks0 % one or more /.try things; one for each path. The last element won't have a /.try @@ -906,9 +921,9 @@ %\noexpand\else % \the\toks1 % invoke /handlers/.unknown handler %\noexpand\fi - \noexpand\else + }{% \the\toks1 % invoke /handlers/.unknown handler - \noexpand\fi + }% }% \expandafter\gdef\expandafter\pgfkeys@global@temp\expandafter##\expandafter1\expandafter\pgfeov\expandafter{\pgfkeys@global@temp}% }% @@ -952,7 +967,6 @@ % Value expansion \pgfkeys{/handlers/.expand once/.code=\expandafter\pgfkeys@exp@call\expandafter{#1}} -\pgfkeys{/handlers/.expand two once/.code 2 args=\expandafter\expandafter\expandafter\pgfkeys@exp@call\expandafter\expandafter\expandafter{\expandafter#1\expandafter}\expandafter{#2}} \pgfkeys{/handlers/.expand twice/.code=\expandafter\expandafter\expandafter\pgfkeys@exp@call\expandafter\expandafter\expandafter{#1}} \pgfkeys{/handlers/.expanded/.code=\edef\pgfkeys@temp{#1}\expandafter\pgfkeys@exp@call\expandafter{\pgfkeys@temp}} @@ -1101,7 +1115,6 @@ \pgfkeysaddhandleonlyexistingexception{.lastretry}% \pgfkeysaddhandleonlyexistingexception{.unknown}% \pgfkeysaddhandleonlyexistingexception{.expand once}% -\pgfkeysaddhandleonlyexistingexception{.expand two once}% \pgfkeysaddhandleonlyexistingexception{.expand twice}% \pgfkeysaddhandleonlyexistingexception{.expanded}% diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex index ef70baf021f..5772bcadca7 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex @@ -1,4 +1,4 @@ -% Copyright 2008 by Christian Feuersaenger +% Copyright 2019 by Christian Feuersaenger % % This file may be distributed and/or modified % @@ -264,7 +264,7 @@ % % If the family exists, #2 will be executed. Otherwise, #3 will be % called. -\long\def\pgfkeysiffamilydefined#1#2#3{\pgfkeys@ifcsname ifpgfk@#1/familyactive\endcsname#2\else#3\fi} +\long\def\pgfkeysiffamilydefined#1#2#3{\ifcsname ifpgfk@#1/familyactive\endcsname#2\else#3\fi} % Sets the TeX boolean % \ifpgfkeysfiltercontinue := ( family #1 is active ) 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 f83674c7528..8f53c1d7ba5 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 d3b817a00f1..5e807b2e4f4 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 @@ -1,4 +1,4 @@ -% Copyright 2013 by Christian Feuersaenger +% Copyright 2019 by Christian Feuersaenger % % This file may be distributed and/or modified % @@ -104,7 +104,7 @@ \expandafter\def\csname pgfpPRP@#1@bigbuf@c\endcsname{0}% }% -% #1: the item to append +% #1: the item to prepend % #2: the list as macro name \long\def\pgfprependlistpushfront#1\to#2{% \begingroup 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 b1c0546c17e..37210d48703 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % @@ -45,6 +45,18 @@ \def\pgfutil@trimspaces@@#1Q#2{#1} \catcode`\Q=11 +% \pgfutil@ifempty{<cs>}{<true code>}{<false code>} +% +% Check if <cs> is equal to \pgfutil@empty +% +% This macro is expandable. +\def\pgfutil@ifempty#1{% + \ifx#1\pgfutil@empty + \expandafter\pgfutil@firstoftwo + \else + \expandafter\pgfutil@secondoftwo + \fi} + % \pgfutil@ifundefined{<macro name with backslash>} % {<is undefined code>}{<is defined code>} % @@ -99,7 +111,7 @@ \csname newcount\expandafter\endcsname\csname pgfutil@pushedmacro@\pgfutil@pushmacro@string\endcsname \fi \global\advance\csname pgfutil@pushedmacro@\pgfutil@pushmacro@string\endcsname 1\relax - \expandafter\glet\csname\the\csname pgfutil@pushedmacro@\pgfutil@pushmacro@string\endcsname\pgfutil@pushmacro@string\endcsname#1% + \global\expandafter\let\csname\the\csname pgfutil@pushedmacro@\pgfutil@pushmacro@string\endcsname\pgfutil@pushmacro@string\endcsname#1% } \def\pgfutil@popmacro#1{% diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def index 7d244efc5fa..651b1cd169c 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % 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 2ac8ec42120..e2ed750368f 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % @@ -119,61 +119,69 @@ } \let\pgfutil@abe\pgfutil@empty% -\RequirePackage{everyshi} -\EveryShipout{% - % Add at begin page stuff - \setbox\@cclv=\vbox{% - \setbox\z@=\hbox{% - % the boxes \pgfutil@abe ("every page") and \pgfutil@abb ("current page") - % are used to generate pdf objects / dictionaries which are - % required for the graphics which are somewhere in the "real" - % page content. - % BUT: these pdf objects MUST NOT be affected by text layout - % shifts! Consequently, we have to undo \hoffset and \voffset - % (which are h/v shifts to the page layout). - % - % Note that this of importance for shadings. To be more - % specific: try out shadings with standalone (which uses - % \hoffset) and with xdvipdfmx (which appears to be more - % fragile than pdflatex) - they break unless we undo \hoffset - % and \voffset. - \ifdim\hoffset=0pt \else \hskip-\hoffset\fi - \pgfutil@abe\unhbox\pgfutil@abb\pgfutil@abc\global\let\pgfutil@abc\pgfutil@empty - \ifdim\hoffset=0pt \else \hskip+\hoffset\fi +\@ifl@t@r\fmtversion{2020/10/01}{% + \AddToHook{shipout/background}{% + \put(\hoffset-1in,\voffset-1in){% + \pgfutil@abe\unhbox\pgfutil@abb\pgfutil@abc\global\let\pgfutil@abc\pgfutil@empty }% - \wd\z@=\z@% - \ht\z@=\z@% - \dp\z@=\z@% - % ... see remark above regarding \hoffset/\voffset: - \ifdim\voffset=0pt \else \vskip-\voffset\fi - \box\z@% - \ifdim\voffset=0pt \else \vskip+\voffset\fi - % - % if TeX changes into vertical mode, it inserts \parskip and - % \lineskip. Disable it here: - \nointerlineskip% - \ifvbox\@cclv \unvbox\@cclv \else\hsize=\wd\@cclv \noindent\unhbox\@cclv \fi% - %\box\@cclv - % using \box instead of \unhbox or \unvbox - % has the advantage that glue settings won't be - % altered (as for \unhbox/\unvbox). But \box breaks compatibility - % with the 'remember picture' feature. }% -} - -% Preview hack: preview.sty hacks into \shipout (which is ok), but -% does not honour everyshi.sty (which is not ok). This causes everyshi -% material to get lost. -\AtBeginDocument{ - \@ifpackageloaded{preview}{% - % Ok, package loaded. Swap definitions of everyshi.sty's shipout - % and preview.sty's shipout: - \ifPreview - \let\shipout\@EveryShipout@Org@Shipout%This is the null version of \shipout, created by preview and saved by everyshi - \let\@EveryShipout@Org@Shipout\pr@shipout% This is the original shipout - \let\pr@shipout\@EveryShipout@Shipout% - \fi - }{}% +}{% + \RequirePackage{everyshi} + \EveryShipout{% + % Add at begin page stuff + \setbox\@cclv=\vbox{% + \setbox\z@=\hbox{% + % the boxes \pgfutil@abe ("every page") and \pgfutil@abb ("current page") + % are used to generate pdf objects / dictionaries which are + % required for the graphics which are somewhere in the "real" + % page content. + % BUT: these pdf objects MUST NOT be affected by text layout + % shifts! Consequently, we have to undo \hoffset and \voffset + % (which are h/v shifts to the page layout). + % + % Note that this of importance for shadings. To be more + % specific: try out shadings with standalone (which uses + % \hoffset) and with xdvipdfmx (which appears to be more + % fragile than pdflatex) - they break unless we undo \hoffset + % and \voffset. + \ifdim\hoffset=0pt \else \hskip-\hoffset\fi + \pgfutil@abe\unhbox\pgfutil@abb\pgfutil@abc\global\let\pgfutil@abc\pgfutil@empty + \ifdim\hoffset=0pt \else \hskip+\hoffset\fi + }% + \wd\z@=\z@% + \ht\z@=\z@% + \dp\z@=\z@% + % ... see remark above regarding \hoffset/\voffset: + \ifdim\voffset=0pt \else \vskip-\voffset\fi + \box\z@% + \ifdim\voffset=0pt \else \vskip+\voffset\fi + % + % if TeX changes into vertical mode, it inserts \parskip and + % \lineskip. Disable it here: + \nointerlineskip% + \ifvbox\@cclv \unvbox\@cclv \else\hsize=\wd\@cclv \noindent\unhbox\@cclv \fi% + %\box\@cclv + % using \box instead of \unhbox or \unvbox + % has the advantage that glue settings won't be + % altered (as for \unhbox/\unvbox). But \box breaks compatibility + % with the 'remember picture' feature. + }% + } + + % Preview hack: preview.sty hacks into \shipout (which is ok), but + % does not honour everyshi.sty (which is not ok). This causes everyshi + % material to get lost. + \AtBeginDocument{ + \@ifpackageloaded{preview}{% + % Ok, package loaded. Swap definitions of everyshi.sty's shipout + % and preview.sty's shipout: + \ifPreview + \let\shipout\@EveryShipout@Org@Shipout%This is the null version of \shipout, created by preview and saved by everyshi + \let\@EveryShipout@Org@Shipout\pr@shipout% This is the original shipout + \let\pr@shipout\@EveryShipout@Shipout% + \fi + }{}% + } } % Guess the driver: diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def index 95dacd18a46..58fa3eac5f8 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def @@ -1,4 +1,4 @@ -% Copyright 2006 by Till Tantau +% Copyright 2019 by Till Tantau % % This file may be distributed and/or modified % |