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 --- .../texmf-dist/doc/generic/pstricks/Changes.dvips | 1 + .../doc/generic/pstricks/Changes.generic | 2 + .../texmf-dist/doc/generic/pstricks/pst-news13.pdf | Bin 93177 -> 93407 bytes .../texmf-dist/doc/generic/pstricks/pst-news13.tex | 2 +- Master/texmf-dist/dvips/pstricks/pst-algparser.pro | 2 +- Master/texmf-dist/dvips/pstricks/pst-dots.pro | 2 +- Master/texmf-dist/dvips/pstricks/pst-ovl.pro | 30 ++++++++ Master/texmf-dist/dvips/pstricks/pstricks.pro | 12 +++- 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 + Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty | 14 ++++ Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 9 ++- 15 files changed, 167 insertions(+), 62 deletions(-) create mode 100644 Master/texmf-dist/dvips/pstricks/pst-ovl.pro create mode 100644 Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex create mode 100644 Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips index 69d4fd98ffa..cac4d77d383 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips @@ -1,4 +1,5 @@ ---- pstricks.pro +1.17 2013-07-08 - move the overlay part into pst-ovl.pro 1.16 2013-05-22 - save color functions 1.15 2012-10-16 - modified Div operator - take eofill into account diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic index aaaecd7c4cf..92d0276ad85 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic @@ -1,4 +1,6 @@ pstricks.tex -------- +2.45 2013-07-08 - moved the overlay part into pst-ovl + - added \@tfor macros if used without \LaTeX 2.44 2013-06-24 - add macros \pssetMonochrome and \pssetGrayscale - added coor option ** for (f(y) y) 2.43 2013-05-12 - allow option ! to the labelsep of \uput diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf index 575043c2e69..baac755abd5 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf and b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf differ diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex index 01f353532b4..0a40dd76b11 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news13.tex 799 2013-06-25 07:42:17Z herbert $ +%% $Id: pst-news13.tex 800 2013-07-09 18:01:00Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro index 1d5fb04c661..8053924b08f 100644 --- a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro +++ b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro @@ -1,4 +1,4 @@ -% $Id: pst-algparser.pro 594 2011-10-31 18:13:18Z herbert $ +% $Id: pst-algparser.pro 801 2013-07-09 18:10:41Z herbert $ %% %% PostScript prologue for PSTricks algorithm parser %% Version 0.04, 2011/10/21 diff --git a/Master/texmf-dist/dvips/pstricks/pst-dots.pro b/Master/texmf-dist/dvips/pstricks/pst-dots.pro index 915c20cf363..f76b179c7ba 100644 --- a/Master/texmf-dist/dvips/pstricks/pst-dots.pro +++ b/Master/texmf-dist/dvips/pstricks/pst-dots.pro @@ -1,4 +1,4 @@ -% $Id: pst-dots.pro 130 2009-08-27 08:55:03Z herbert $ +% $Id: pst-dots.pro 801 2013-07-09 18:10:41Z herbert $ % %% PostScript prologue for pstricks.tex. %% Version 2.02, 2009/06/16 diff --git a/Master/texmf-dist/dvips/pstricks/pst-ovl.pro b/Master/texmf-dist/dvips/pstricks/pst-ovl.pro new file mode 100644 index 00000000000..7b9844066ce --- /dev/null +++ b/Master/texmf-dist/dvips/pstricks/pst-ovl.pro @@ -0,0 +1,30 @@ +% $Id: pst-ovl.pro 801 2013-07-09 18:10:41Z herbert $ +% +%% PostScript prologue for pst-ovl.tex. +%% Version 0.01, 2013/07/08 +%% +%% 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. +% +% +/tx@ovl 10 dict def +tx@ovl begin +% +/BeginOL { + dup (all) eq exch TheOL eq or + { IfVisible not { Visible /IfVisible true def } if } + { IfVisible { Invisible /IfVisible false def } if } ifelse +} def +% +/InitOL { + /OLUnit [ 3000 3000 matrix defaultmatrix dtransform ] cvx def + /Visible { CP OLUnit idtransform T moveto } def + /Invisible { CP OLUnit neg exch neg exch idtransform T moveto } def + /BOL { BeginOL } def + /IfVisible true def +} def +% +end +% +% END pst-ovl.pro diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index e86f6a85333..c0edb6bf1b2 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,7 +1,7 @@ -% $Id: pstricks.pro 783 2013-05-22 05:38:43Z herbert $ +% $Id: pstricks.pro 801 2013-07-09 18:10:41Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.16, 2013/05/22 +%% Version 1.17, 2013/07/08 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -37,6 +37,14 @@ tx@Dict begin /Tan { dup sin exch cos Div } def % sin(x)/cos(x) x in degrees /Acos {dup dup mul neg 1 add dup 0 lt { % arc cos, returns 0 when negative root pop pop 0 }{ sqrt exch atan} ifelse } def +/Acos2 { 2 dict begin + /x ED /y ED + y abs 1.0e-20 lt { 1.0e30 } if + x y div + dup dup mul neg 1 add dup 0 lt { % arc cos needs two values x,y + pop pop 0 }{ sqrt exch atan} ifelse + y 0 lt { 180 add } if +} def /NET { neg exch neg exch T } def % change coordinate system to the negative one /Pyth { dup mul exch dup mul add sqrt } def % Pythagoras, expects 2 parameter /Pyth2 { % Pythagoras, xA yA xB yB 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. diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty b/Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty new file mode 100644 index 00000000000..12b7d351547 --- /dev/null +++ b/Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty @@ -0,0 +1,14 @@ +%% $Id: pst-ovl.sty 800 2013-07-09 18:01:00Z herbert $ +%% +%% pst-ovl.sty Copyright (C) 2013 Herbert Voss +%% +\NeedsTeXFormat{LaTeX2e} + +\ProvidesPackage{pst-ovl} + [2013/07/08 v0.01 LaTeX wrapper for `pst-ovl' (HV)] +\input{pst-ovl} +\ProvidesFile{pst-ovl.tex} + [2013/07/08 v0.01 overlay macros `pst-ovl' (HV)] + +\endinput +%% diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 988387e7e78..93cec7b9b2b 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty @@ -34,6 +34,8 @@ % \newif\ifpst@OldVersion\pst@OldVersionfalse \DeclareOption{97}{\pst@OldVersiontrue} +\newif\ifpst@ovl\pst@ovlfalse +\DeclareOption{overlays}{\global\pst@ovltrue} \newif\ifpst@PDF\pst@PDFfalse \DeclareOption{pdf}{\global\pst@PDFtrue} %------------------------------------ PLAIN -------------------------------- @@ -68,7 +70,12 @@ ************************************} \fi \fi - +% +\ifpst@ovl + \typeout{>>> Loading package pst-ovl <<<}% + \RequirePackage{pst-ovl} +\fi +% \@ifundefined{PSTricksLoaded} {% \let\saved@scalebox\scalebox -- cgit v1.2.3