diff options
author | Karl Berry <karl@freefriends.org> | 2015-08-08 22:54:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-08-08 22:54:29 +0000 |
commit | 531d43fafa269c546d587eaca6cd14adcd11914f (patch) | |
tree | 1883933af984c60254e6d9d1bd955a76748cb827 /Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex | |
parent | 877e963d44f039783cb9227d90c911866c780961 (diff) |
pgf (8aug15)
git-svn-id: svn://tug.org/texlive/trunk@38079 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex | 22 |
1 files changed, 17 insertions, 5 deletions
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 d0fdab957aa..887e86e00e7 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorearrows.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorearrows.code.tex,v 1.40 2013/11/07 15:45:46 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorearrows.code.tex,v 1.43 2015/05/14 14:43:05 cfeuersaenger Exp $ @@ -575,8 +575,9 @@ } \def\pgfarrows@angle@setup@prime#1{% - \pgf@yc#1 pt% - \pgfmathtan@{.5\pgf@yc}% + \pgf@yc#1 pt % + \pgf@yc=0.5\pgf@yc + \pgfmathtan@{\pgf@sys@tonumber\pgf@yc}% \pgfarrowwidth\pgfmathresult\pgfarrowlength% \pgfarrowwidth2\pgfarrowwidth% } @@ -871,15 +872,26 @@ \expandafter\pgftransformxshift\expandafter{\the\pgf@xc}% } +\def\pgf@arrows@color@setup@restore@std@colors{% + % we want to allow 'arrows={fill=pgffillcolor}'. To this end, we have to ensure that \string\color@pgffillcolor is known. + % we can safely keep the macro in the current TeX group since it has global character anyway. + % + % Note that declaring \string\color@pgfstrokecolor as \global macro causes save stack issues and should be avoided. + \pgfutil@namelet{\string\color@pgfstrokecolor}{pgf@strokecolor@global}% + \pgfutil@namelet{\string\color@pgffillcolor}{pgf@fillcolor@global}% + % +}% + \def\pgf@arrows@color@setup{% \ifx\pgf@arrows@stroke@color\pgfutil@empty\else\pgfsetstrokecolor{\pgf@arrows@stroke@color}\fi% \ifx\pgf@arrows@fill@color\pgfutil@empty% - \expandafter\expandafter\expandafter\ifx% - \expandafter\csname\expandafter\string\expandafter\color@pgfstrokecolor\expandafter\endcsname\csname\string\color@pgffillcolor\endcsname% + \ifx\pgf@strokecolor@global\pgf@fillcolor@global \else + \pgf@arrows@color@setup@restore@std@colors \pgfsetfillcolor{pgfstrokecolor}% \fi% \else% + \pgf@arrows@color@setup@restore@std@colors \pgfsetfillcolor{\pgf@arrows@fill@color}% \fi% } |