diff options
author | Norbert Preining <preining@logic.at> | 2006-10-04 08:43:01 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2006-10-04 08:43:01 +0000 |
commit | ba9472aebfed07843bc4faa00c7b96bc86194691 (patch) | |
tree | 4a952a012e2f1663beaac6384dec265fb50dd361 /Master/texmf-dist/tex/generic/pgf/utilities | |
parent | a88bdfe70c672cfced299babf0a54881a916bcca (diff) |
Fix ctan2tds for pgf installation
comment powerdot-doc-vn in tpm-ctan-check, it always breaks
Update of the following packages:
labelcas pstricks-add sectionbox ltxmisc frenchle flowfram verse emulateapj
pst-pdf poemscol babelbib dk-bib breakurl screenplay ncctools xkeyval bibleref
muthesis pst-labo pgf ncclatex active-conf xcolor commath lineno dottex makeplo
git-svn-id: svn://tug.org/texlive/trunk@2240 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/utilities')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex | 4 |
2 files changed, 9 insertions, 11 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}}}% }% 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 3686eec117b..b744514f544 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex @@ -9,7 +9,7 @@ % prints out a message to the log. -\def\pgfversion{1.00} +\def\pgfversion{1.01} \ifx\pgfrcsloaded\undefined @@ -77,7 +77,7 @@ \def\ProvidesFile#1[#2]{\wlog{Loading file #1 version #2.}} \fi -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/utilities/pgfrcs.code.tex,v 1.7 2005/10/23 16:16:21 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/utilities/pgfrcs.code.tex,v 1.8 2005/11/14 17:37:52 tantau Exp $ \catcode`\@=\pgfrcsatcode |