From 23d768f5857651f306060a6d2e70ce95fdae4f6b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Jul 2013 23:28:41 +0000 Subject: pstricks (10jul13) git-svn-id: svn://tug.org/texlive/trunk@31172 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/pstricks/pst-fp.tex | 2 +- Master/texmf-dist/tex/generic/pstricks/pst-key.tex | 1 + Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex | 80 ++++++++++++++++++++++ .../texmf-dist/tex/generic/pstricks/pstricks.tex | 71 +++++-------------- .../texmf-dist/tex/generic/pstricks/pstricks97.tex | 1 + 5 files changed, 99 insertions(+), 56 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex (limited to 'Master/texmf-dist/tex/generic/pstricks') diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex index 046f8e58185..03252b6454e 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex @@ -1,4 +1,4 @@ -%% $Id: pst-fp.tex 259 2010-01-17 09:51:50Z herbert $ +%% $Id: pst-fp.tex 800 2013-07-09 18:01:00Z herbert $ %% %% %% This is file `pst-fp.tex', diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-key.tex b/Master/texmf-dist/tex/generic/pstricks/pst-key.tex index 06fa572ac8d..dc32ba57a51 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-key.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-key.tex @@ -1,3 +1,4 @@ +%% $Id: pst-key.tex 800 2013-07-09 18:01:00Z herbert $ %% %% This is file `pst-key.tex', %% generated with the docstrip utility. diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex b/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex new file mode 100644 index 00000000000..7470510f962 --- /dev/null +++ b/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex @@ -0,0 +1,80 @@ +%% $Id: pst-ovl.tex 803 2013-07-09 20:34:57Z herbert $ +%% +%% +%% This is file `pst-ovl.tex', +%% +%% IMPORTANT NOTICE: +%% +%% Package `pst-ovl.tex' +%% +%% Herbert Voss +%% +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN archives +%% in directory macros/latex/base/lppl.txt. +%% +%% DESCRIPTION: +%% `pst-ovl' is a PSTricks related package for +%% overlay support +%% +\csname PSTovlloaded\endcsname +\let\PSTovlloaded\endinput +% +% Requires main PSTricks +\ifx\PSTricksLoaded\endinput\else\input pstricks \fi +% +\def\fileversion{0.01} +\def\filedate{2013/07/08} +\message{`pst-ovl' v\fileversion, \filedate\space (hv)} +% +\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax +% +\pstheader{pst-ovl.pro} +% +\def\tx@BeginOL{tx@ovl begin BeginOL } +\def\tx@InitOL{tx@ovl begin InitOL } +% +\def\pst@initoverlay#1{\pst@Verb{\tx@InitOL /TheOL (#1) def end}} +\def\AltOverlayMode{% + \def\pst@initoverlay##1{% + \pst@Verb{% + \tx@InitOL + /Visible { initclip } def + /Invisible { + CP newpath OLUnit itransform moveto clip newpath moveto + } def + /TheOL (##1) def end }}} +% +\def\pst@overlay#1{% + \edef\curr@overlay{#1}% + \pst@Verb{tx@ovl begin (#1) BOL end}% + \aftergroup\pst@endoverlay} +% +\def\pst@endoverlay{\pst@Verb{tx@ovl begin (\curr@overlay) BOL end}} +\def\curr@overlay{all} +% +\newbox\theoverlaybox +% +\def\overlaybox{% + \global\setbox\theoverlaybox=\hbox\bgroup + \begingroup + \let\psoverlay\pst@overlay + \def\overlaybox{% + \@pstrickserr{Overlays cannot be nested}\@eha}% + \def\putoverlaybox{% + \@pstrickserr{You must end the overlay box + before using \string\putoverlaybox}}% + \psoverlay{main}% + \ignorespaces} +% +\def\endoverlaybox{\endgroup\egroup} +\def\putoverlaybox#1{% + \hbox{\pst@initoverlay{#1}\copy\theoverlaybox}} +% +\def\psoverlay{\@pstrickserr{\string\psoverlay\space + can only be used after \string\overlaybox}} +% +\catcode`\@=\PstAtCode\relax +% +%% END: pst-ovl.tex +\endinput diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 33f6234ab74..d8d129996ee 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -1,3 +1,4 @@ +%% $Id: pst-fp.tex 259 2010-01-17 09:51:50Z herbert $ %% pstricks.tex %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. %% COPYRIGHT 2000-2003 by Denis Girou. @@ -18,10 +19,10 @@ \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput % -%% !! loading additional TeX packages see line 95 !! -%% !! loading config file pstricks.con line 463 !! -%% !! loading pro files line 476 !! -%% !! fileversion and date see line 105 !! +%% !! loading additional TeX packages see line 108 !! +%% !! loading config file pstricks.con line 473 !! +%% !! loading pro files line 486 !! +%% !! fileversion and date see line 115 !! % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -59,14 +60,21 @@ \endgroup \def\endtabular{\crcr\egroup\egroup $\egroup} \def\@width{width}% needed by pst-node -\fi + \def\@tfor#1:={\@tf@r#1 } + \long\def\@tf@r#1#2\do#3{\def\@fortmp{#2}\ifx\@fortmp\space\else + \@tforloop#2\@nil\@nil\@@#1{#3}\fi}% + \long\def\@tforloop#1#2\@@#3#4{\def#3{#1}\ifx #3\@nnil + \expandafter\@fornoop \else + #4\relax\expandafter\@tforloop\fi#2\@@#3{#4}} + \long\def\@break@tfor#1\@@#2#3{\csname fi\endcsname\csname fi\endcsname} +\fi% \catcode`\@=\PstAtCode\relax % % 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@ch@ckch@ice#1#2#3{% bugfix for xkeyval \def\XKV@tempa{#1}% \ifx\XKV@tempa\@nnil\let\XKV@tempa\@empty\else \def\XKV@tempa{\def#1{#2}}% @@ -103,8 +111,8 @@ \input pgffor.code.tex \let\pgfforeach\foreach % -\def\fileversion{2.44} -\def\filedate{2013/06/24} +\def\fileversion{2.45} +\def\filedate{2013/07/09} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -4247,53 +4255,6 @@ pop \@namedef{pspicture*}{\pspicture*} \@namedef{endpspicture*}{\endpspicture} % -%------------------------------- Overlays ------------------------------ -% -\def\tx@BeginOL{BeginOL } -\def\tx@InitOL{InitOL } -% -\def\pst@initoverlay#1{\pst@Verb{\tx@InitOL /TheOL (#1) def}} -\def\AltOverlayMode{% - \def\pst@initoverlay##1{% - \pst@Verb{% - \tx@InitOL - /Visible { initclip } def - /Invisible { - CP newpath OLUnit itransform moveto clip newpath moveto - } def - /TheOL (##1) def}}} -% -\def\pst@overlay#1{% - \edef\curr@overlay{#1}% - \pst@Verb{(#1) BOL}% - \aftergroup\pst@endoverlay} -% -\def\pst@endoverlay{\pst@Verb{(\curr@overlay) BOL}} -\def\curr@overlay{all} -% -\newbox\theoverlaybox -% -\def\overlaybox{% - \global\setbox\theoverlaybox=\hbox\bgroup - \begingroup - \let\psoverlay\pst@overlay - \def\overlaybox{% - \@pstrickserr{Overlays cannot be nested}\@eha}% - \def\putoverlaybox{% - \@pstrickserr{You must end the overlay box - before using \string\putoverlaybox}}% - \psoverlay{main}% - \ignorespaces} -% -\def\endoverlaybox{\endgroup\egroup} -\def\putoverlaybox#1{% - \hbox{\pst@initoverlay{#1}\copy\theoverlaybox}} -% -\def\psoverlay{\@pstrickserr{\string\psoverlay\space - can only be used after \string\overlaybox}} -% -\ifx\pstcustomize\relax \input pstricks.con \fi -% \catcode`\@=\PstAtCode\relax % \endinput diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex index 6f169c67ce5..dde14c39444 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex @@ -1,3 +1,4 @@ +%% $Id: pst-fp.tex 259 2010-01-17 09:51:50Z herbert $ %% BEGIN: pstricks.tex %% %% PostScript macros for Generic TeX: main input file for PSTricks 97. -- cgit v1.2.3