summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex16
1 files changed, 7 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex
index 46ee571bf7d..139ac162264 100644
--- a/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex
+++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex
@@ -53,10 +53,8 @@
\xdef#1{\the\toks@}%
\endgroup}
\long\def\mbox#1{\leavevmode\hbox{#1}}
-\begingroup
\def\:{\global\let\@sptoken= } \:
\def\:{\@xifnch} \expandafter\def\: {\futurelet\@let@token\@ifnch}
-\endgroup
\def\@nnil{\@nil}
\def\@fornoop#1\@@#2#3{}
\long\def\@for#1:=#2\do#3{%
@@ -106,7 +104,8 @@
\def\newcounter#1{\expandafter\alloc@\expandafter0\expandafter\count\expandafter\countdef\expandafter\insc@unt\csname c@#1\endcsname}%
\def\setcounter#1#2{\global\csname c@#1\endcsname#2\relax}%
\def\addtocounter#1#2{\global\advance\csname c@#1\endcsname #2\relax}
-\def\setlength#1#2{#1#2\relax}
+\newskip\pgf@length@skip
+\def\setlength#1#2{\pgf@length@skip#2\relax#1\pgf@length@skip}
\def\addtolength#1#2{\advance#1 #2\relax}
@@ -146,17 +145,15 @@
\definecolor{brown}{rgb}{0.75,0.5,0.25}
\def\color#1{%
+ \colorlet{.}{#1}%
\pgfsysprotocol@getcurrentprotocol\pgf@emu@temp%
{%
\pgfsysprotocol@setcurrentprotocol\@empty%
\pgfsysprotocol@bufferedtrue%
- \pgfsetcolor{#1}%
+ \pgfsetcolor{.}%
\expandafter\pgfsys@outerinvoke\expandafter{\pgfsysprotocol@currentprotocol}%
}%
\pgfsysprotocol@setcurrentprotocol\pgf@emu@temp%
- \edef\pgf@marshal{\noexpand\let\expandafter\noexpand\csname\string\color@.\endcsname=%
- \expandafter\noexpand\csname\string\color@#1\endcsname}%
- \pgf@marshal%
\aftergroup\reset@color%
}
\def\reset@color{%
@@ -173,11 +170,12 @@
\def\colorlet#1#2{%
- \in@!{#2}%
+ \edef\pgf@marshal{#2}%
+ \expandafter\in@\expandafter!\expandafter{\pgf@marshal}%
\ifin@%
% compute mixture
{%
- \pgf@emu@mix#2!white!\@nil%
+ \expandafter\pgf@emu@mix\pgf@marshal!white!\@nil%
\xdef\pgf@marshal{\noexpand\def\expandafter\noexpand\csname\string\color@#1\endcsname{%
\noexpand\xcolor@{}{}{rgb}{\pgf@sys@tonumber\pgf@xa,\pgf@sys@tonumber\pgf@xb,\pgf@sys@tonumber\pgf@xc}}}%
}%