summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-14 22:08:43 +0000
committerKarl Berry <karl@freefriends.org>2014-05-14 22:08:43 +0000
commit0e4d93dadf0f1cbaa9d8819eb2d8a323968cef73 (patch)
treeb7302f81135d10d1e0956299822af0ddefa9ee07 /Master/texmf-dist
parentedb8fd9cd71fb2e6cac92760f74f7204ba25b46d (diff)
pst-ovl (14may14)
git-svn-id: svn://tug.org/texlive/trunk@34033 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pst-ovl/Changes3
-rw-r--r--Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.pdfbin44318 -> 46171 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-ovl/pst-ovl-doc.tex41
-rw-r--r--Master/texmf-dist/dvips/pst-ovl/pst-ovl.pro4
-rw-r--r--Master/texmf-dist/tex/generic/pst-ovl/pst-ovl.tex29
-rw-r--r--Master/texmf-dist/tex/latex/pst-ovl/pst-ovl.sty9
6 files changed, 53 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-ovl/Changes b/Master/texmf-dist/doc/generic/pst-ovl/Changes
index 9edb4c6092b..2d6e080b4d8 100644
--- a/Master/texmf-dist/doc/generic/pst-ovl/Changes
+++ b/Master/texmf-dist/doc/generic/pst-ovl/Changes
@@ -1,9 +1,12 @@
pst-ovl.tex ----------- (hv)
+ 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
v 0.03 2013-12-24 create own package with documentation
v 0.02 2013-11-28 move functions into tx@Dict dictionary
pst-ovl.pro ----------- (hv)
+ v 0.04 2014-05-12 make it compatible to seminar
v 0.03 2013-12-24 first official version
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 59d9f483939..7ddf3273b96 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 c1b4e709a96..d38eff844cc 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
@@ -40,34 +40,49 @@ the commands
\begin{overlaybox} <stuff> \end{overlaybox}
\end{lstlisting}
-The material for overlay <string> should go within the scope of the command
+The material for overlay \texttt{<number>} should go within the scope of the command
- \Lcs{psoverlay}\Largb{string}
+ \Lcs{psoverlay}\Largb{number}
-<string> can be any string, after expansion. Anything not in the scope of any
-\Lcs{psoverlay} command goes on overlay "`main"', and material within the scope of
-\Lcs{psoverlay}\Largb{all} goes on all the overlays. \Lcs{psoverlay}
+\texttt{<number>} can be any any number, after expansion. Anything not in the scope of any
+\Lcs{psoverlay} command goes on overlay "`0"', and material within the scope of
+\Lcs{psoverlay}\Largb{-1} goes on all the overlays. \Lcs{psoverlay}
commands can be nested and can be used in math mode.
-
The command
-\Lcs{putoverlaybox}\Largb{string}
-
-then prints overlay <string>.
+\Lcs{putoverlaybox}\Largb{number}
+then prints overlay \texttt{<number>}.
+%
Here is an example:
\begin{LTXexample}[pos=t]
\overlaybox
-\psoverlay{all}
+\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
+
+\putoverlaybox{0} \hspace{.5in} \putoverlaybox{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
+\psoverlay{\all}
\psframebox[framearc=.15,linewidth=1.5pt]{%
- \psoverlay{main}
+ \psoverlay{\main}
\parbox{3.5cm}{\raggedright
- Foam Cups Damage Environment {\psoverlay{one} Less than
+ Foam Cups Damage Environment {\psoverlay{\one} Less than
Paper Cups,} Study Says.}}
\endoverlaybox
-\putoverlaybox{main} \hspace{.5in} \putoverlaybox{one}
+\putoverlaybox{\main} \hspace{.5in} \putoverlaybox{\one}
\end{LTXexample}
diff --git a/Master/texmf-dist/dvips/pst-ovl/pst-ovl.pro b/Master/texmf-dist/dvips/pst-ovl/pst-ovl.pro
index 2e4ce76ce1c..188299ff6ab 100644
--- a/Master/texmf-dist/dvips/pst-ovl/pst-ovl.pro
+++ b/Master/texmf-dist/dvips/pst-ovl/pst-ovl.pro
@@ -1,7 +1,7 @@
% $Id: pst-ovl.pro 859 2013-12-21 16:51:58Z herbert $
%
%% PostScript prologue for pst-ovl.tex.
-%% Version 0.03, 2013/12/21
+%% Version 0.04, 2014/05/12
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -12,7 +12,7 @@
tx@ovlDict begin
%
/BeginOL {
- dup (all) eq exch TheOL eq or
+ dup -1 eq exch TheOL eq or
{ IfVisible not { Visible /IfVisible true def } if }
{ IfVisible { Invisible /IfVisible false def } if } ifelse
} def
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 008009f2847..6b60fce4e97 100644
--- a/Master/texmf-dist/tex/generic/pst-ovl/pst-ovl.tex
+++ b/Master/texmf-dist/tex/generic/pst-ovl/pst-ovl.tex
@@ -15,28 +15,29 @@
%% in directory macros/latex/base/lppl.txt.
%%
%% DESCRIPTION:
-%% `pst-ovl' is a PSTricks related package for
+%% `pst-ovl' is a PostScript related package for
%% overlay support
%%
\csname PSTovlloaded\endcsname
\let\PSTovlloaded\endinput
%
-% Requires main PSTricks
+%% Requires main PSTricks
\ifx\PSTricksLoaded\endinput\else\input pstricks \fi
%
-\def\fileversion{0.04}
-\def\filedate{2013/12/28}
+\def\fileversion{0.06}
+\def\filedate{2014/05/12}
\message{`pst-ovl' v\fileversion, \filedate\space (tvz,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
%
-\pstheader{pst-ovl.pro}
-%
\def\tx@BeginOL{ tx@ovlDict begin BeginOL }
\def\tx@InitOL{ tx@ovlDict begin InitOL }
\def\tx@BOL{ tx@ovlDict begin BOL end }
%
-\def\pst@initoverlay#1{\pst@Verb{ \tx@InitOL /TheOL (#1) def end }}
+\pstheader{pst-ovl.pro}
+%
+\def\pst@initoverlay#1{\pst@Verb{ \tx@InitOL end /TheOL #1 def }}
+%
\def\AltOverlayMode{%
\def\pst@initoverlay##1{%
\pst@Verb{
@@ -45,16 +46,16 @@
/Invisible {
CP newpath OLUnit itransform moveto clip newpath moveto
} def
- /TheOL (##1) def end }}}
+ /TheOL ##1 def end }}}
%
\def\pst@overlay#1{%
\edef\curr@overlay{#1}%
- \pst@Verb{ tx@ovlDict begin (#1) BOL end }%
+ \expandafter\pst@Verb\expandafter{ #1 \tx@BOL }%
\aftergroup\pst@endoverlay}
%
-\def\pst@endoverlay{\pst@Verb{ tx@ovlDict begin (\curr@overlay) BOL end }}
-\def\curr@overlay{all}
-%
+\def\pst@endoverlay{\expandafter\pst@Verb\expandafter{\curr@overlay \space \tx@BOL }}
+\def\curr@overlay{-1}
+
\newbox\theoverlaybox
%
\def\overlaybox{%
@@ -66,12 +67,12 @@
\def\putoverlaybox{%
\@pstrickserr{You must end the overlay box
before using \string\putoverlaybox}}%
- \psoverlay{main}%
+ \psoverlay{0}%
\ignorespaces}
%
\def\endoverlaybox{\endgroup\egroup}
\def\putoverlaybox#1{%
- \hbox{\pst@initoverlay{#1}\copy\theoverlaybox}}
+ \hbox{\expandafter\pst@initoverlay\expandafter{#1}\copy\theoverlaybox}}
%
\def\psoverlay{\@pstrickserr{\string\psoverlay\space
can only be used after \string\overlaybox}}
diff --git a/Master/texmf-dist/tex/latex/pst-ovl/pst-ovl.sty b/Master/texmf-dist/tex/latex/pst-ovl/pst-ovl.sty
index 84ca3cd63e3..b56353db9ec 100644
--- a/Master/texmf-dist/tex/latex/pst-ovl/pst-ovl.sty
+++ b/Master/texmf-dist/tex/latex/pst-ovl/pst-ovl.sty
@@ -5,13 +5,14 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pst-ovl}
- [2013/07/08 v0.01 LaTeX wrapper for `pst-ovl' (HV)]
-\input{pst-ovl}
+ [2014/01/02 v0.01 LaTeX wrapper for `pst-ovl' (HV)]
\ProvidesFile{pst-ovl.tex}
- [2013/07/08 v0.01 overlay macros `pst-ovl' (HV)]
+ [2014/05/12 v0.06 overlay macros `pst-ovl' (HV)]
+\input{pst-ovl}
+%\@addtofilelist{pst-ovl.tex}
\IfFileExists{pst-ovl.pro}{%
\ProvidesFile{pst-ovl.pro}%
- [2013/12/21, PostScript prologue file (hv)]
+ [2014/05/12, PostScript prologue file (hv)]
\@addtofilelist{pst-ovl.pro}}{}%
\endinput