From fa6bff3dec71cc8230f06c1fd25ec0dade525f6f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 26 May 2012 22:23:26 +0000 Subject: pstricks 2.28 (25may12) git-svn-id: svn://tug.org/texlive/trunk@26665 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 52 +++++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 2e0c4e83b5e..632e593ebe2 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -18,10 +18,10 @@ \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput % -%% !! loading additional TeX packages see line 70 !! -%% !! loading config file pstricks.con line 380 !! -%% !! loading pro files line 395 !! -%% !! fileversion and date see line 67 !! +%% !! loading additional TeX packages see line 95 !! +%% !! loading config file pstricks.con line 454 !! +%% !! loading pro files line 467 !! +%% !! fileversion and date see line 97 !! % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -64,10 +64,38 @@ % now we have all commands defined, for TeX and LaTeX % \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi +\catcode`\@=11\relax +\def\XKV@ch@ckch@ice#1#2#3{% + \def\XKV@tempa{#1}% + \ifx\XKV@tempa\@nnil\let\XKV@tempa\@empty\else + \def\XKV@tempa{\def#1{#2}}% + \fi +% \in@{,#2,}{,#3,}% +\begingroup\edef\x{\endgroup\noexpand\in@{,#2,}}\x{,#3,} +%\expandafter\in@\expandafter{\expandafter,#2,}{,#3,}% --- hv 2012-04-27 +%\typeout{=====>foo<=====}% + \ifin@ + \ifXKV@pl + \XKV@addtomacro@n\XKV@tempa\@firstoftwo + \else + \XKV@addtomacro@n\XKV@tempa\@firstofone + \fi + \else + \ifXKV@pl + \XKV@addtomacro@n\XKV@tempa\@secondoftwo + \else + \XKV@toks{#2}% + \XKV@err{value `\the\XKV@toks' is not allowed}% + \XKV@addtomacro@n\XKV@tempa\@gobble + \fi + \fi + \XKV@tempa +} +\catcode`\@=\PstAtCode\relax \ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi % -\def\fileversion{2.27} -\def\filedate{2012/03/11} +\def\fileversion{2.28} +\def\filedate{2012/05/24} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -1614,6 +1642,18 @@ }% \gdef\pst@code{}% } +\def\use@psCode{% + \pstVerb{ + \pst@dict + \tx@STP + \pst@newpath + \psk@origin + \psk@swapaxes + \pst@code + end + }% + \gdef\pst@code{}% +} \def\pst@newpath{newpath } % \def\pst@@killglue{\unskip\ifdim\lastskip>\z@\expandafter\pst@@killglue\fi} -- cgit v1.2.3