summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-poly/Changes2
-rw-r--r--Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.bib151
-rw-r--r--Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.pdfbin184120 -> 181079 bytes
-rw-r--r--Master/texmf-dist/source/generic/pst-poly/Makefile70
-rw-r--r--Master/texmf-dist/tex/generic/pst-poly/pst-poly.tex64
-rw-r--r--Master/texmf-dist/tex/latex/pst-poly/pst-poly.sty3
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
7 files changed, 85 insertions, 206 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-poly/Changes b/Master/texmf-dist/doc/generic/pst-poly/Changes
index 353b7cf3748..bf12aa07128 100644
--- a/Master/texmf-dist/doc/generic/pst-poly/Changes
+++ b/Master/texmf-dist/doc/generic/pst-poly/Changes
@@ -1,3 +1,5 @@
+1.63 2014/08/28 - bugfix for trailing spaces in \PstPolygon
+1.62 2010/05/28 - use the dimens from the base packgage pstricks
1.61 2009/12/20 - use \NormalCoor for IntemediatePoint setting
- allow \SpecialCoor for a length
- updated documentation
diff --git a/Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.bib b/Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.bib
index 032e9914720..f7d1f9a8d55 100644
--- a/Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.bib
@@ -14,81 +14,13 @@ yy%% -*-bibtex-*-
@STRING{theaterkasse = {Von der Theaterkasse} }
@STRING{theatertage = {{\TeX}-Theatertage} }
-@Book{PSTricks2,
- author = {Herbert Vo\ss},
- title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {fifth},
- publisher = {DANTE -- Lob.media},
- year = {2008},
- address = {Heidelberg/Hamburg}
-}
-
-@Book{companion04,
- author = {Frank Mittelbach and Michel Goosens et al},
- title = {The {\LaTeX} {C}ompanion},
- edition = {second},
- publisher = {Addison-Wesley Publishing Company},
- year = {2004},
- address = {Boston}
-}
-
-@Book{unbound,
- author = {Alan Hoenig},
- title = {\TeX{} {U}nbound: \LaTeX{} \& \TeX{} {S}trategies, {F}onts, {G}raphics, and {M}ore},
- publisher = {Oxford University Press},
- year = {1998},
- address = {London}
-}
-@Article{ dtk02.2:jackson.voss:plot-funktionen,
- author = {Laura E. Jackson and Herbert Vo{\ss}},
- title = {Die Plot-Funktionen von {\texttt{pst-plot}}},
- journal = dtk,
- year = 2002,
- volume = {2/02},
- altvolume = 2,
- altnumber = 14,
- month = jun,
- pages = {27--34},
- annote = bretter,
- keywords = {},
- abstract = { Im letzten Heft wurden die mathematischen Funktionen von
- \PS~im Zusammenhang mit dem {\LaTeX}-Paket
- \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben
- und durch Beispiele erl{\"a}utert. In diesem Teil werden
- die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r
- externe Daten behandelt. }
-}
-
-@Article{ dtk02.1:voss:mathematischen,
- author = {Herbert Vo{\ss}},
- title = {Die mathematischen {F}unktionen von {P}ost{S}cript},
- journal = dtk,
- year = 2002,
- volume = {1/02},
- altvolume = 1,
- altnumber = 14,
- month = mar,
- pages = {},
- annote = bretter,
- keywords = {},
- abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
- Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
- darum geht zu beurteilen, was es denn nun im eigentlichen
- Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
- sich mit den \PS-Funktionen viele Dinge erledigen lassen,
- bei denen sonst auf externe Programme zur{\"u}ckgegriffen
- wird. Dies wird im Folgenden f{\"u}r die mathematischen
- Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot}
- gezeigt. }
-}
-
-@Book{tlgc2,
- author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
+@Book{companion,
+ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
title = {The {\LaTeX} {G}raphics {C}ompanion},
publisher = {{Addison-Wesley Publishing Company}},
- edition = second,
+ edition = {second},
year = {2007},
- address = {Reading, Mass.}
+ address = {Boston, Mass.}
}
@Article{girou:01:,
@@ -113,52 +45,65 @@ yy%% -*-bibtex-*-
@Book{PostScript,
Author = {Kollock, Nikolai G.},
- Title = {PostScript richtig eingesetzt: vom {K}onzept zum
+ Title = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
praktischen {E}insatz},
Publisher = {IWT},
Address = {Vaterstetten},
year = 1989,
}
-@Manual{pstricks,
- Title = {PSTricks - {\PS} macros for generic {\TeX}},
+@Manual{multido,
+ Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
Author = {{Timothy Van} Zandt},
Organization = {},
- Address = {\url{http://www.tug.org/application/PSTricks}},
+ Address = {\url{CTAN:/macros/generic/multido.tex}},
Note = {},
- year = 1993
+ year = 1997
}
-@Manual{pst-plot,
- Title = {\texttt{pst-plot}: Plotting two dimensional functions and data},
- Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
- Note = {},
- year = 1999
+@Book{PSTricks2,
+ author = {Herbert Vo\ss{}},
+ title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
+ edition = {6.},
+ publisher = {DANTE -- Lehmanns},
+ year = {2010},
+ address = {Heidelberg/Hamburg}
}
-@Manual{multido,
- Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
- Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
- Note = {},
- year = 1997
+@Book{PSTricksE,
+ author = {Herbert Vo\ss{}},
+ title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
+ edition = {1.},
+ publisher = {UIT},
+ year = {2011},
+ address = {Cambridge -- UK}
+}
+
+@Book{LTXquick,
+ author = {Herbert Vo\ss{}},
+ title = {{\LaTeX} quick reference},
+ edition = {1.},
+ publisher = {UIT},
+ year = {2012},
+ address = {Cambridge -- UK}
}
-@MISC{xkeyval,
- author = {Hendri Adriaens},
- title = {xkeyval package},
- howpublished = {\url{CTAN:/macros/latex/contrib/xkeyval}},
- year = 2004
+@Book{presentations,
+ author = {Herbert Vo\ss},
+ title = {Presentations with \LaTeX},
+ edition = {1.},
+ publisher = {DANTE -- Lehmanns Media},
+ year = {2012},
+ address = {Heidelberg/Berlin}
}
-@book{voss:ref,
- Title = {{\LaTeX} {Referenz}},
- Author = {Herbert Vo\ss},
- Publisher = {Lehmanns Media/DANTE},
- Edition= 2,
- Address= {Berlin/Heidelberg},
- Year= {2010},
+
+@Book{tbt,
+ author = {Victor Eijkhout},
+ title = {\TeX\ by Topic -- {A} \TeX{}nician Reference},
+ edition = {1},
+ publisher = {DANTE -- lehmanns media},
+ year = {2014},
+ address = {Heidelberg/Berlin}
}
+
diff --git a/Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.pdf b/Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.pdf
index e6549533721..1419f8cb5bd 100644
--- a/Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-poly/pst-poly-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/pst-poly/Makefile b/Master/texmf-dist/source/generic/pst-poly/Makefile
deleted file mode 100644
index f5e96d6e155..00000000000
--- a/Master/texmf-dist/source/generic/pst-poly/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-
-# `Makefile' for `pst-poly.pdf', hv, 2009/12/08
-
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-
-PACKAGE = pst-poly
-
-MAIN = $(PACKAGE)-doc
-
-LATEX = latex
-
-ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
-
-ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
-
-TDS = ~/PSTricks/PSTricks-TDS
-
-all : doc clean
-doc: $(MAIN).pdf
-
-$(MAIN).pdf : $(MAIN).ps
- GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
-
-$(MAIN).ps : $(MAIN).dvi
- dvips $<
-
-$(MAIN).dvi : $(MAIN).tex
- $(LATEX) $<
- $(LATEX) $<
- if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
- if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
- makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
- $(basename $<).glo
- makeindex -t $(basename $<).ilg -o $(basename $<).ind \
- $(basename $<).idx
- bibtex $(basename $<)
- $(LATEX) $<
- $(LATEX) $<
-
-clean :
- $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .bbl)
- $(RM) $(addprefix $(MAIN), .dvi .ps .eps)
-
-veryclean : clean
- $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
-
-arch :
- zip $(ARCHNAME).zip $(ARCHFILES)
-
-tds:
- cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/
- cp -u README $(TDS)/doc/generic/$(PACKAGE)/
- cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/
-#
- cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/
- cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/
-#
- cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/
- cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/
-#
-# cp -u Changes $(TDS)/dvips/$(PACKAGE)/
-# cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/
-#
- cp -u Changes $(TDS)/source/$(PACKAGE)/
- cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/
- cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/
- cp -u Makefile $(TDS)/source/$(PACKAGE)/
-
-
-# EOF
diff --git a/Master/texmf-dist/tex/generic/pst-poly/pst-poly.tex b/Master/texmf-dist/tex/generic/pst-poly/pst-poly.tex
index 9720ab84087..ab5afcca650 100644
--- a/Master/texmf-dist/tex/generic/pst-poly/pst-poly.tex
+++ b/Master/texmf-dist/tex/generic/pst-poly/pst-poly.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-poly.tex 187 2009-12-20 12:44:24Z herbert $
+%% $Id: pst-poly.tex 332 2010-05-28 18:45:07Z herbert $
%%
%% This is file `pst-poly.tex',
%%
@@ -8,8 +8,6 @@
%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
%% Herbert Voss <hvoss@tug.org>
%%
-%% december 20, 2009
-%%
%% 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.
@@ -26,8 +24,8 @@
\ifx\MultidoLoaded\endinput\else \input multido.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{1.61}
-\def\filedate{2009/12/20}
+\def\fileversion{1.63}
+\def\filedate{2014/08/28}
\message{`PST-Polygon' v\fileversion, \filedate\space (DG/hv)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -62,18 +60,18 @@
%
\def\PstPolygon{\pst@object{PstPolygon}}
\def\PstPolygon@i{{%
- \use@par%
+ \use@par
\if@star\solid@star\fi
\ifodd\PstPoly@Offset\def\PstPoly@Decimal{.5}\else\def\PstPoly@Decimal{}\fi
\ifPst@PstPicture\pspicture(-1,-1)(1,1)\fi
\rput{\PstPoly@Rotation}(0,0){%
- \degrees[\PstPoly@NbSides]
+ \degrees[\PstPoly@NbSides]%
\NormalCoor
- \pssetlength{\PstPoly@IntermediatePointDim}{\PstPoly@IntermediatePoint}
+ \pssetlength{\PstPoly@IntermediatePointDim}{\PstPoly@IntermediatePoint}%
\SpecialCoor
\ifx\PstPoly@Name\@empty
\else
- \pnode(0,0){\PstPoly@Name 0}
+ \pnode(0,0){\PstPoly@Name 0}%
\ifnum\psxunit=\psyunit
\def\PstPoly@Node{\pnode(1;\i)}%
\else
@@ -82,27 +80,27 @@
\i\space 360 \PstPoly@NbSides\space div mul sin)}%
\fi
\multido{\i=0+1}{\PstPoly@NbSides}{%
- \PstPoly@Node{\PstPoly@Name\the\multidocount}}
+ \PstPoly@Node{\PstPoly@Name\the\multidocount}}%
\fi
- \pscustom{%
+ \pscustom{
\ifPst@PolyEpicycloid
\pst@cnta=\PstPoly@NbSides
\divide\pst@cnta\tw@
\multido{\i=0+1}{\PstPoly@NbSides}{%
\moveto(1;\i)
\lineto(1;\the\pst@cnta)
- \advance\pst@cnta\PstPoly@Offset}
+ \advance\pst@cnta\PstPoly@Offset}%
\else
\ifnum\psxunit=\psyunit \moveto(1,0)\else\moveto(! 1 0)\fi
\ifx\PstPoly@IntermediatePoint\@empty
\ifnum\psxunit=\psyunit
\def\PstPoly@Junction{\lineto(1;\i)}%
\else
- \def\PstPoly@Junction{\lineto%
+ \def\PstPoly@Junction{\lineto
(! \i\space 360 \PstPoly@NbSides\space div mul cos
\i\space 360 \PstPoly@NbSides\space div mul sin)}%
\fi
- \multido{\i=\PstPoly@Offset+\PstPoly@Offset}{\PstPoly@NbSides}{\PstPoly@Junction}
+ \multido{\i=\PstPoly@Offset+\PstPoly@Offset}{\PstPoly@NbSides}{\PstPoly@Junction}%
\else
\ifPst@PolyCurves\let\PstPoly@JunctionType\pscurve\else\let\PstPoly@JunctionType\psline\fi
\ifnum\psxunit=\psyunit
@@ -120,12 +118,12 @@
\divide\pst@cnta\tw@
\multido{\i=\PstPoly@Offset+\PstPoly@Offset}{\PstPoly@NbSides}{%
\PstPoly@Junction
- \advance\pst@cnta\PstPoly@Offset}
+ \advance\pst@cnta\PstPoly@Offset}%
\fi
- \fi}
+ \fi}%
\ifx\PstPolygonNode\@undefined
- \else\multido{\INode=\z@+\PstPoly@Offset}{\PstPoly@NbSides}{\PstPolygonNode}\fi}
- \ifPst@PstPicture\endpspicture\fi%
+ \else\multido{\INode=\z@+\PstPoly@Offset}{\PstPoly@NbSides}{\PstPolygonNode}\fi}%
+ \ifPst@PstPicture\endpspicture\fi
}}
%
\def\PstTriangle{\pst@object{PstTriangle}}
@@ -145,7 +143,7 @@
\def\PstPentagon{\pst@object{PstPentagon}}
\def\PstPentagon@i{{%
\addto@par{PolyNbSides=5,PolyRotation=18}% For pentagon (360/5/4)
- \use@par%
+ \use@par
\if@star\solid@star\fi
\PstPolygon}}
%
@@ -205,13 +203,15 @@
\if@star\solid@star\fi
\PstPolygon}}
%
-\newdimen\pst@dimm
-\newdimen\pst@dimn
-\newdimen\pst@dimo
-\newdimen\pst@dimp
+% Aspecial version for pst-poly
+\def\pst@polypyth#1#2#3{\ifdim#1>#2\pst@@polypyth#1#2#3\else\pst@@polypyth#2#1#3\fi}
+\def\pst@@polypyth#1#2#3{%
+ \ifdim4#1>9#2 #3=#1\advance#3 .2122#2%
+ \else#3=.8384#1\advance#3 .5758#2\fi}
+%
\def\pspolygonbox{\pst@object{pspolygonbox}}% voss 2004-11-20
\def\pspolygonbox@i{\pst@makebox\pspolygonbox@ii}
-\def\pspolygonbox@ii{{%
+\def\pspolygonbox@ii{%
\begingroup%
\addbefore@par{boxsep=true}%
\pst@useboxpar%
@@ -222,11 +222,14 @@
\fi%
\advance\pst@dima by \psframesep%
\pst@dimc=\wd\pst@hbox%
- \pst@dimp=\pst@dimc\advance\pst@dimp by 2\pst@dima%
- \pst@dimb=\dp\pst@hbox\pst@dimo=\pst@dimb%
- \pst@dimd=\ht\pst@hbox\advance\pst@dimo by \pst@dimd% totalheight
- \pst@pyth\pst@dimp\pst@dimo\pst@dimm%
- \divide\pst@dimm by 2% Radius
+ \pst@dimp=\pst@dimc
+ \advance\pst@dimp by 2\pst@dima
+ \pst@dimb=\dp\pst@hbox
+ \pst@dimo=\pst@dimb%
+ \pst@dimd=\ht\pst@hbox
+ \advance\pst@dimo by \pst@dimd% totalheight
+ \pst@polypyth\pst@dimp\pst@dimo\pst@dimm
+ \global\divide\pst@dimm by 2% Radius
\setbox\pst@hbox=\hbox{%
\ifpsboxsep\kern\pst@dima\fi% left side
\begin@ClosedObj%
@@ -243,7 +246,6 @@
\pst@cp
\tx@polygonB
\psline@iii
-%% \tx@Line
\tx@Polygon
}%
\def\pst@linetype{1}%
@@ -262,7 +264,7 @@
\leavevmode%
\box\pst@hbox%
\endgroup%
-}\ignorespaces}
+ \ignorespaces}
%
\pst@def{polygonB}<{%
/x1 framesep neg def
diff --git a/Master/texmf-dist/tex/latex/pst-poly/pst-poly.sty b/Master/texmf-dist/tex/latex/pst-poly/pst-poly.sty
index 0945714a207..f6176fac98e 100644
--- a/Master/texmf-dist/tex/latex/pst-poly/pst-poly.sty
+++ b/Master/texmf-dist/tex/latex/pst-poly/pst-poly.sty
@@ -1,7 +1,6 @@
%% $Id: pst-poly.sty 187 2009-12-20 12:44:24Z herbert $
\RequirePackage{pstricks}
-\ProvidesPackage{pst-poly}[2009/12/20 package wrapper for
- pst-poly.tex (dg,hv)]
+\ProvidesPackage{pst-poly}[2009/12/20 package wrapper for pst-poly.tex (dg,hv)]
\input{pst-poly.tex}
\ProvidesFile{pst-poly.tex}
[\filedate\space v\fileversion\space `PST-poly' (dg,hv)]
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index b727c3a09f1..050bbd6e4d5 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -289,6 +289,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'coronet', "die 'skipping, nonfree font'",
'corridx', "die 'skipping, Pascal source'",
'count1to', "die 'skipping, use ms'",
+ 'courier', "die 'skipping, nonfree IBM Courier font'",
'cpssp', "die 'skipping, requires python'",
'create-struktex', "die 'sorry, investigate self-locating?'",
'croatian', "die 'skipping, nonfree (nomodify) license'",
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 20:22:46 +0000