diff options
author | Karl Berry <karl@freefriends.org> | 2011-09-19 23:43:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-09-19 23:43:48 +0000 |
commit | c7c92880e5c8f6ad55e824bccf807b912be9f92b (patch) | |
tree | 739cc6ec51c138590456de5ac34491a471802d3b /Master | |
parent | 4d41d6dca62a66e63d7ec95657880e857efd4be4 (diff) |
pst-coil 1.06 (19sep11)
git-svn-id: svn://tug.org/texlive/trunk@24020 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-coil/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf | bin | 298604 -> 300409 bytes | |||
-rw-r--r-- | Master/texmf-dist/dvips/pst-coil/pst-coil.pro | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex | 33 |
5 files changed, 23 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-coil/Changes b/Master/texmf-dist/doc/generic/pst-coil/Changes index 9e342b4e6d2..4f3d672fac9 100644 --- a/Master/texmf-dist/doc/generic/pst-coil/Changes +++ b/Master/texmf-dist/doc/generic/pst-coil/Changes @@ -2,6 +2,7 @@ pst-coil.sty -------- 2010-02-01 message for loading the pro file pst-coil.tex -------- +v. 1.06 2011-09-18 - fix bug with \pszigzag v. 1.05 2011-07-12 - added optional argument bow for circular zigzags v. 1.04 2010-02-02 - allow an absolute value for the period diff --git a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib index 1e97f17565b..9b2f6aed051 100644 --- a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib +++ b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib @@ -77,7 +77,7 @@ @Book{PSTricks2-UIT, author = {Herbert Vo\ss}, - title = {PSTricks -- Graphics for \LaTeX}, + title = {PSTricks -- Graphics and PostScript for \LaTeX\ and \TeX}, publisher = {UIT}, year = {2011}, address = {Cambridge/UK} diff --git a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf Binary files differindex 4f1569b1d41..ba0b9f66a38 100644 --- a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf diff --git a/Master/texmf-dist/dvips/pst-coil/pst-coil.pro b/Master/texmf-dist/dvips/pst-coil/pst-coil.pro index 026f662e779..1e59078b28c 100644 --- a/Master/texmf-dist/dvips/pst-coil/pst-coil.pro +++ b/Master/texmf-dist/dvips/pst-coil/pst-coil.pro @@ -1,6 +1,6 @@ %!ps % PostScript prologue for pst-coil.tex. -% Version 1.05, 2011/07/12 +% Version 1.06, 2011/09/18 % For distribution, see pstricks.tex. % /tx@CoilDict 40 dict def tx@CoilDict begin @@ -73,7 +73,7 @@ /lineto load stopped { moveto } if BeginAngle Inc EndAngle { CoilLoop } for EndAngle CoilLoop mtrx setmatrix } def -/ZigZag { +/ZigZag { 15 dict begin /ArmB ED /ArmA ED 2 div /w ED w mul /h ED /y1 ED /x1 ED /y0 ED /x0 ED @@ -86,7 +86,8 @@ /x ArmB h 2 div add def mark 0 0 ArmB 0 n { x w /w w neg def /x x h add def } repeat - TotalLength ArmA sub 0 TotalLength 0 } def + TotalLength ArmA sub 0 TotalLength 0 + end } def % /ZigZagCirc { % x0 y0 x1 y1 bow h w ArmA ArmB on stack /bow ED diff --git a/Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex b/Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex index 1770fda18a9..da59da4c7ae 100644 --- a/Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex +++ b/Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex @@ -1,4 +1,4 @@ -%% $Id: pst-coil.tex 537 2011-07-12 08:07:40Z herbert $ +%% $Id: pst-coil.tex 578 2011-09-18 17:18:46Z herbert $ %% BEGIN pst-coil.tex %% %% Coils and zigzags with PSTricks @@ -21,8 +21,8 @@ \ifx\PSTnodeLoaded\endinput \else\input pst-node.tex\fi \ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi % -\def\fileversion{1.05} -\def\filedate{2011/07/12} +\def\fileversion{1.06} +\def\filedate{2011/09/17} % \edef\TheAtCode{\the\catcode`\@} \catcode`\@=11 @@ -85,29 +85,30 @@ \@nameuse{psls@\pslinestyle} }% \end@OpenObj} % -\define@key[psset]{pst-coil}{bow}[\z@]{% - \pst@getlength{#1}\psk@bow \pst@dima=\psk@bow pt - \pst@absdim{\pst@dima}{\pst@dimb} - \ifdim\pst@dimb<1pt \def\psk@bow{0}\fi} -\psset[pst-coil]{bow=\z@} +\define@key[psset]{pst-coil}{bow}[0]{% + \pst@getlength{#1}\psk@bow% + \pst@dimm=\psk@bow pt% + \pst@absdim{\pst@dimm}{\pst@dimn}% + \ifdim\pst@dimn<1pt \def\psk@bow{0}\fi}% +\psset[pst-coil]{bow=0} % \def\pszigzag{\def\pst@par{}\pst@object{pszigzag}} \def\pszigzag@i{\pst@getarrows\pszigzag@ii} \def\pszigzag@ii(#1){\@ifnextchar({\pszigzag@iii{1}(#1)}{\pszigzag@iii{\z@}(0,0)(#1)}} \def\pszigzag@iii#1(#2)(#3){% \addbefore@par{bow=0}% - \begin@OpenObj - \pst@getcoor{#2}\pst@tempa - \pst@getcoor{#3}\pst@tempb - \pst@optcp{#1}\pst@tempa + \begin@OpenObj% + \pst@getcoor{#2}\pst@tempA% + \pst@getcoor{#3}\pst@tempB% + \pst@optcp{#1}\pst@tempA% \addto@pscode{% - \pst@tempa - \pst@tempb + \pst@tempA + \pst@tempB \pscoilheight \psk@coilwidth \psk@coilarmA - \psk@coilarmB - \ifdim\psk@bow pt=\z@\tx@ZigZag\else\psk@bow\space\tx@ZigZagCirc\fi + \psk@coilarmB + \ifdim\psk@bow pt=\z@ \tx@ZigZag \else \psk@bow\space \tx@ZigZagCirc \fi \psline@iii \tx@Line }% \end@OpenObj} |