From 0e4d93dadf0f1cbaa9d8819eb2d8a323968cef73 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 May 2014 22:08:43 +0000 Subject: pst-ovl (14may14) git-svn-id: svn://tug.org/texlive/trunk@34033 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/pst-ovl/pst-ovl.tex | 29 ++++++++++++----------- Master/texmf-dist/tex/latex/pst-ovl/pst-ovl.sty | 9 +++---- 2 files changed, 20 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex') 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 -- cgit v1.2.3