summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-30 23:37:18 +0000
committerKarl Berry <karl@freefriends.org>2013-12-30 23:37:18 +0000
commitaff2c3672a30400e7eb0e29f6db8d2c06e399297 (patch)
tree6999c816d2288e2aed80d872549b08c530da41ca /Master/texmf-dist/tex
parent60fc3c6750c727bcf42ee4601a1fb2c8f28dbc38 (diff)
pstricks (27dec13)
git-svn-id: svn://tug.org/texlive/trunk@32515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex80
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstPlain.tex5
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex25
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty18
4 files changed, 16 insertions, 112 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex b/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex
deleted file mode 100644
index 6ac70b3e9eb..00000000000
--- a/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-%% $Id: pst-ovl.tex 856 2013-12-09 10:34:40Z herbert $
-%%
-%%
-%% This is file `pst-ovl.tex',
-%%
-%% IMPORTANT NOTICE:
-%%
-%% Package `pst-ovl.tex'
-%%
-%% Herbert Voss <hvoss@tug.org>
-%%
-%% 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.03}
-\def\filedate{2013/12/21}
-\message{`pst-ovl' v\fileversion, \filedate\space (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\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@ovlDict begin (#1) BOL end }%
- \aftergroup\pst@endoverlay}
-%
-\def\pst@endoverlay{\pst@Verb{ tx@ovlDict 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/pstPlain.tex b/Master/texmf-dist/tex/generic/pstricks/pstPlain.tex
deleted file mode 100644
index 243413cede7..00000000000
--- a/Master/texmf-dist/tex/generic/pstricks/pstPlain.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-%\input pst-xkey
-\input pstricks
-This is a test
-\bye
-
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index c16e8f4d8e0..d4a80896378 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.49b}
-\def\filedate{2013/12/21}
+\def\fileversion{2.49c}
+\def\filedate{2013/12/27}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -3641,18 +3641,25 @@ pop
%
\def\psRing{\def\pst@par{}\pst@object{psRing}}%% hv 20130405
\def\psRing@i{\@ifnextchar({\psRing@ii}{\psRing@ii(0,0)}}
-\def\psRing@ii(#1)#2#3{% origin, inner radius, outer radius
- \begin@ClosedObj
+\def\psRing@ii(#1){%
\pst@@getcoor{#1}%
- \pssetlength\pst@dimc{#2}%
- \pssetlength\pst@dimd{#3}%
+ \@ifnextchar[{\psRing@iii}{\psRing@iii[0,360]}}
+\def\psRing@iii[#1,#2]#3#4{% origin, inner radius, outer radius
+ \begin@ClosedObj
+ \pssetlength\pst@dimc{#3}%
+ \pssetlength\pst@dimd{#4}%
+ \pst@getangle{#1}\pst@tempa
+ \pst@getangle{#2}\pst@tempb
\def\pst@linetype{4}%
\addto@pscode{
- \pst@coor translate newpath
+ \pst@coor translate
\pst@number\pst@dimc \psk@dimen CLW mul sub /InnerRadius ED
\pst@number\pst@dimd \psk@dimen CLW mul sub /OuterRadius ED
- 0 0 InnerRadius 0 360 arc OuterRadius 0 moveto
- 0 0 OuterRadius 0 0.0001 arcn
+ InnerRadius 0 moveto newpath
+ 0 0 InnerRadius \pst@tempa\space \pst@tempb\space arc
+ OuterRadius \pst@tempb\space PtoC
+ \pst@tempb\space \pst@tempa\space sub abs 360 eq { moveto }{ lineto } ifelse % whole circle or not??
+ 0 0 OuterRadius \pst@tempb\space \pst@tempa\space arcn
closepath
}%
\showpointsfalse
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty b/Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty
deleted file mode 100644
index 2fe72766af8..00000000000
--- a/Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty
+++ /dev/null
@@ -1,18 +0,0 @@
-%% $Id: pst-ovl.sty 800 2013-07-09 18:01:00Z herbert $
-%%
-%% pst-ovl.sty Copyright (C) 2013 Herbert Voss <hvoss@tug.org>
-%%
-\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)]
-\IfFileExists{pst-ovl.pro}{%
- \ProvidesFile{pst-ovl.pro}%
- [2013/12/21, PostScript prologue file (hv)]
- \@addtofilelist{pst-ovl.pro}}{}%
-
-\endinput
-%%