summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.dvips7
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic8
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news13.pdfbin99529 -> 99832 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data4
-rw-r--r--Master/texmf-dist/dvips/pstricks/pst-ovl.pro5
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro16
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex12
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex6
8 files changed, 30 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
index 7d2df4e6dc5..35a889d7a79 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
@@ -1,5 +1,6 @@
---- pstricks.pro
-1.20 2013-11-25 - fix for Rand
+1.21 2013-11-28 - deleted the overlay stuff
+1.20 2013-11-26 - fix for Rand
1.19 2013-11-08 - do not put /Uput in a local dictionary
1.18 2013-11-05 - put /UUput and /Uput in local dictionaries
1.17 2013-07-08 - move the overlay part into pst-ovl.pro
@@ -58,3 +59,7 @@
---- pstricks97.pro
Version 97 patch 3, 98/06/01
+
+
+---- pst-ovl.pro
+0.02 2013-11-28 - moved the function into tx@Dict
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index b406cd0de7a..1e21d6de2a0 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,4 +1,10 @@
pstricks.tex --------
+versions like 2.47a have only changes in other files, but not
+in this main package.
+
+
+2.48 2013-11-29 - fixed trailing space for !!
+2.47a 2013-11-28 - changes in pst-ovl
2.47 2013-11-26 - added special coor type !! for Postfix notation
in user coordinates
2.46 2013-08-13 - fixed bug with \pstcustomize (delete a line)
@@ -173,3 +179,5 @@ pst-fp.tex ----------- (hv)
v 0.02 2009-04-02 initial version
+pst-ovl.tex ----------- (hv)
+ v 0.02 2013-11-28 move functions into tx@Dict dictionary
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
index f42fc5b81b8..fc221ba1233 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
new file mode 100644
index 00000000000..8bd09389cc7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
@@ -0,0 +1,4 @@
+some nonsense in this line ---time forcex forcey
+0 0.2
+1 1
+2 4
diff --git a/Master/texmf-dist/dvips/pstricks/pst-ovl.pro b/Master/texmf-dist/dvips/pstricks/pst-ovl.pro
index 7b9844066ce..25b33a5254e 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-ovl.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-ovl.pro
@@ -1,15 +1,14 @@
% $Id: pst-ovl.pro 801 2013-07-09 18:10:41Z herbert $
%
%% PostScript prologue for pst-ovl.tex.
-%% Version 0.01, 2013/07/08
+%% Version 0.02, 2013/11/28
%%
%% 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
+tx@Dict begin
%
/BeginOL {
dup (all) eq exch TheOL eq or
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index aeffd84d929..0b807713838 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,7 +1,7 @@
% $Id: pstricks.pro 853 2013-11-26 20:32:06Z herbert $
%
%% PostScript prologue for pstricks.tex.
-%% Version 1.20, 2013/11/26
+%% Version 1.21, 2013/11/28
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -1099,20 +1099,6 @@ dup angle0 sub dup abs 180 gt { 180 add 360 div floor 360 mul sub } { pop } ifel
end
} def
%
-/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
%-----------------------------------------------------------------------------%
%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex b/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex
index 7470510f962..879397d8a9e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex
@@ -23,16 +23,16 @@
% Requires main PSTricks
\ifx\PSTricksLoaded\endinput\else\input pstricks \fi
%
-\def\fileversion{0.01}
-\def\filedate{2013/07/08}
+\def\fileversion{0.02}
+\def\filedate{2013/11/28}
\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\tx@BeginOL{tx@Dict begin BeginOL }
+\def\tx@InitOL{tx@Dict begin InitOL }
%
\def\pst@initoverlay#1{\pst@Verb{\tx@InitOL /TheOL (#1) def end}}
\def\AltOverlayMode{%
@@ -47,10 +47,10 @@
%
\def\pst@overlay#1{%
\edef\curr@overlay{#1}%
- \pst@Verb{tx@ovl begin (#1) BOL end}%
+ \pst@Verb{tx@Dict begin (#1) BOL end}%
\aftergroup\pst@endoverlay}
%
-\def\pst@endoverlay{\pst@Verb{tx@ovl begin (\curr@overlay) BOL end}}
+\def\pst@endoverlay{\pst@Verb{tx@Dict begin (\curr@overlay) BOL end}}
\def\curr@overlay{all}
%
\newbox\theoverlaybox
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index fc4c7f472fe..702543739aa 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -110,8 +110,8 @@
\input pgffor.code.tex
\let\pgfforeach\foreach
%
-\def\fileversion{2.47}
-\def\filedate{2013/11/26}
+\def\fileversion{2.48}
+\def\filedate{2013/11/29}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -968,7 +968,7 @@
%
\def\raw@coor{\@ifnextchar!\raw@@coor\raw@@@coor}
\def\raw@@coor!#1;#2\@nil{% PostScript code without using \tx@ScreenCoor
- \edef\pst@coor{#1}}
+ \edef\pst@coor{#1 }}
\def\raw@@@coor#1;#2\@nil{% PostScript code
\edef\pst@coor{ #1 \tx@ScreenCoor }}
%