summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-03 22:18:40 +0000
committerKarl Berry <karl@freefriends.org>2016-05-03 22:18:40 +0000
commit996fcfc57aeb92c629c0d4d1856bc9ec24693876 (patch)
tree4ba30c91488ee5e94e0a87952f725a1cdc4efdb0 /Master
parentc6bfcca248f6a0ceacc867b2e70068e760a40d86 (diff)
pst-ovl (3may16)
git-svn-id: svn://tug.org/texlive/trunk@40873 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-ovl/Changes2
-rw-r--r--Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.pdfbin46171 -> 48418 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.tex16
-rw-r--r--Master/texmf-dist/tex/generic/pst-ovl/pst-ovl.tex32
4 files changed, 26 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-ovl/Changes b/Master/texmf-dist/doc/generic/pst-ovl/Changes
index 2d6e080b4d8..0960ac683a9 100644
--- a/Master/texmf-dist/doc/generic/pst-ovl/Changes
+++ b/Master/texmf-dist/doc/generic/pst-ovl/Changes
@@ -1,5 +1,7 @@
pst-ovl.tex ----------- (hv)
+ v 0.07 2016-05-03 - moved code from seminar
+ - use names as \ps...
v 0.06 2014-05-12 moved code from seminar
v 0.05 2014-01-02 do not load PSTricks
v 0.04 2013-12-28 forgot Timothy as author
diff --git a/Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.pdf b/Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.pdf
index 7ddf3273b96..3d216ce771f 100644
--- a/Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.tex b/Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.tex
index d38eff844cc..78fcabed073 100644
--- a/Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.tex
@@ -33,11 +33,11 @@ Overlays are made by creating an "`\Lcs{hbox}"' and then outputting the box seve
times, printing different material in the box each time. The box is created by
the commands
\begin{lstlisting}
- \Lcs{overlaybox} < stuff >\Lcs{endoverlaybox}
+ \Lcs{psoverlaybox} < stuff >\Lcs{endpsoverlaybox}
\end{lstlisting}
\LaTeX{} users can instead write:
\begin{lstlisting}
- \begin{overlaybox} <stuff> \end{overlaybox}
+ \begin{psoverlaybox} <stuff> \end{psoverlaybox}
\end{lstlisting}
The material for overlay \texttt{<number>} should go within the scope of the command
@@ -57,32 +57,32 @@ then prints overlay \texttt{<number>}.
Here is an example:
\begin{LTXexample}[pos=t]
-\overlaybox
+\psoverlaybox
\psoverlay{-1}
\psframebox[framearc=.15,linewidth=1.5pt]{%
\psoverlay{0}
\parbox{3.5cm}{\raggedright
Foam Cups Damage Environment {\psoverlay{1} Less than
Paper Cups,} Study Says.}}
- \endoverlaybox
+ \endpsoverlaybox
-\putoverlaybox{0} \hspace{.5in} \putoverlaybox{1}
+\psputoverlaybox{0} \hspace{.5in} \psputoverlaybox{1}
\end{LTXexample}
It is possible to define macros which hold the numbers:
\begin{LTXexample}[pos=t]
\def\all{-1} \def\main{0} \def\one{1}
-\overlaybox
+\psoverlaybox
\psoverlay{\all}
\psframebox[framearc=.15,linewidth=1.5pt]{%
\psoverlay{\main}
\parbox{3.5cm}{\raggedright
Foam Cups Damage Environment {\psoverlay{\one} Less than
Paper Cups,} Study Says.}}
- \endoverlaybox
+ \endpsoverlaybox
-\putoverlaybox{\main} \hspace{.5in} \putoverlaybox{\one}
+\psputoverlaybox{\main} \hspace{.5in} \psputoverlaybox{\one}
\end{LTXexample}
diff --git a/Master/texmf-dist/tex/generic/pst-ovl/pst-ovl.tex b/Master/texmf-dist/tex/generic/pst-ovl/pst-ovl.tex
index 6b60fce4e97..115f3442db0 100644
--- a/Master/texmf-dist/tex/generic/pst-ovl/pst-ovl.tex
+++ b/Master/texmf-dist/tex/generic/pst-ovl/pst-ovl.tex
@@ -7,7 +7,7 @@
%%
%% Package `pst-ovl.tex'
%%
-%% 2014 -- Timothy Van Zandt
+%% 2015 -- Timothy Van Zandt
%% Herbert Voss <hvoss@tug.org>
%%
%% This program can be redistributed and/or modified under the terms
@@ -24,15 +24,15 @@
%% Requires main PSTricks
\ifx\PSTricksLoaded\endinput\else\input pstricks \fi
%
-\def\fileversion{0.06}
-\def\filedate{2014/05/12}
+\def\fileversion{0.07}
+\def\filedate{2016/05/03}
\message{`pst-ovl' v\fileversion, \filedate\space (tvz,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
%
\def\tx@BeginOL{ tx@ovlDict begin BeginOL }
\def\tx@InitOL{ tx@ovlDict begin InitOL }
-\def\tx@BOL{ tx@ovlDict begin BOL end }
+\def\tx@BOLend{ tx@ovlDict begin BOL end }
%
\pstheader{pst-ovl.pro}
%
@@ -50,29 +50,29 @@
%
\def\pst@overlay#1{%
\edef\curr@overlay{#1}%
- \expandafter\pst@Verb\expandafter{ #1 \tx@BOL }%
+ \expandafter\pst@Verb\expandafter{ #1 \tx@BOLend }%
\aftergroup\pst@endoverlay}
%
-\def\pst@endoverlay{\expandafter\pst@Verb\expandafter{\curr@overlay \space \tx@BOL }}
+\def\pst@endoverlay{\expandafter\pst@Verb\expandafter{\curr@overlay \space \tx@BOLend }}
\def\curr@overlay{-1}
-
-\newbox\theoverlaybox
%
-\def\overlaybox{%
- \global\setbox\theoverlaybox=\hbox\bgroup
+\newbox\thepsoverlaybox
+%
+\def\psoverlaybox{%
+ \global\setbox\thepsoverlaybox=\hbox\bgroup
\begingroup
\let\psoverlay\pst@overlay
- \def\overlaybox{%
+ \def\psoverlaybox{%
\@pstrickserr{Overlays cannot be nested}\@eha}%
- \def\putoverlaybox{%
+ \def\psputoverlaybox{%
\@pstrickserr{You must end the overlay box
- before using \string\putoverlaybox}}%
+ before using \string\psputoverlaybox}}%
\psoverlay{0}%
\ignorespaces}
%
-\def\endoverlaybox{\endgroup\egroup}
-\def\putoverlaybox#1{%
- \hbox{\expandafter\pst@initoverlay\expandafter{#1}\copy\theoverlaybox}}
+\def\endpsoverlaybox{\endgroup\egroup}
+\def\psputoverlaybox#1{%
+ \hbox{\expandafter\pst@initoverlay\expandafter{#1}\copy\thepsoverlaybox}}
%
\def\psoverlay{\@pstrickserr{\string\psoverlay\space
can only be used after \string\overlaybox}}