diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries')
3 files changed, 12 insertions, 27 deletions
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 73a47f6574c..98cdffe154c 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 @@ -358,7 +358,7 @@ execute before day scope={\ifdate{day of month=1}{% \def\tikz@lib@cal@calendar{% \begingroup% \let\tikz@lib@cal@ifs=\pgfutil@empty% - \tikz@expandcount=1000\relax% + \tikz@resetexpandcount \tikzset{name=,at={(0,0)}}% \let\%=\pgfcalendarshorthand% \tikzset{every calendar/.try}% @@ -370,27 +370,13 @@ execute before day scope={\ifdate{day of month=1}{% } \def\tikz@lib@cal@handle{% - \let\pgfutil@next=\tikz@lib@cal@expand% - \ifx\pgf@let@token;% - \let\pgfutil@next=\tikz@lib@cal@stop% - \else% - \ifx\pgf@let@token(%) - \let\pgfutil@next=\tikz@lib@cal@name% - \else% - \ifx\pgf@let@token a% - \let\pgfutil@next=\tikz@lib@cal@at% - \else% - \ifx\pgf@let@token[% - \let\pgfutil@next=\tikz@lib@cal@option% - \else% - \ifx\pgf@let@token i% - \let\pgfutil@next=\tikz@lib@cal@if% - \fi% - \fi% - \fi% - \fi% - \fi% - \pgfutil@next% + \pgfutil@switch\pgfutil@ifx\pgf@let@token{% + {;}{\let\pgfutil@next\tikz@lib@cal@stop}% + {(}{\let\pgfutil@next\tikz@lib@cal@name}%) + {a}{\let\pgfutil@next\tikz@lib@cal@at}% + {[}{\let\pgfutil@next\tikz@lib@cal@option}%] + {i}{\let\pgfutil@next\tikz@lib@cal@if}% + }{\tikz@resetexpandcount\pgfutil@next}{\tikz@lib@cal@expand}% } \def\tikz@lib@cal@expand{% \advance\tikz@expandcount by -1 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 3e703fad986..4683c71cd3f 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 @@ -532,7 +532,8 @@ \long\def\tikz@math@for@parselist#1{% \edef\tikz@math@for@list{#1}% - \tikz@math@collecttosemicolon{\tikz@math@for@parseaction}}% + \tikz@math@gobblespaces{% + \tikz@math@collecttosemicolon{\tikz@math@for@parseaction}}}% \def\tikz@math@for@parseaction{% \tikz@math@for@namedef{prevvalue}{}% 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 1a5e47b4461..7f3a63b045f 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 @@ -97,7 +97,7 @@ \pgftransformcm{\pgf@lib@svg@a}{\pgf@lib@svg@b}{\pgf@lib@svg@c}{\pgf@lib@svg@d}{\pgfpointorigin}% } }]{}; - \expandafter\pgfutil@switch\expandafter{\tikz@anchor}{% + \expandafter\pgfutil@switch\expandafter\pgfutil@ifstrequal\expandafter{\tikz@anchor}{% {north} {\def\tikz@spy@anchor{south}}% {north east}{\def\tikz@spy@anchor{south west}}% {east} {\def\tikz@spy@anchor{west}}% @@ -106,9 +106,7 @@ {south west}{\def\tikz@spy@anchor{north east}}% {west} {\def\tikz@spy@anchor{east}}% {north west}{\def\tikz@spy@anchor{south east}}% - % default to center - {default} {\def\tikz@spy@anchor{center}}% - } + }{}{\def\tikz@spy@anchor{center}}% \node [alias=tikzspyinnode,inner sep=0pt,outer sep=0pt,at={#2},every spy in node/.try, path picture={\node[anchor=\tikz@spy@anchor,tikz@lib@reset@gs]{\nullfont% \pgfpicture\relax\pgfsetbaseline{default}\pgfsettrimleft{default}\pgfsettrimright{default}% |