From 044406949b6a163bd857ddda24438610926c565c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 8 Jun 2012 23:11:46 +0000 Subject: pstricks 2.29 (5jun12) git-svn-id: svn://tug.org/texlive/trunk@26865 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/generic/pstricks/Changes.generic | 1 + .../texmf-dist/doc/generic/pstricks/pst-news12.pdf | Bin 78827 -> 78934 bytes .../texmf-dist/tex/generic/pstricks/pstricks.tex | 35 ++++++++++----------- Master/tlpkg/libexec/ctan2tds | 1 + 4 files changed, 18 insertions(+), 19 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic index 957daf9183b..ea993bfe454 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic @@ -1,4 +1,5 @@ pstricks.tex -------- +2.29 2012-06-04 - fixed itroduced trailing space with boolkey 2.28 2012-05-24 - added \add@psCode, which uses \pstVerb instead of \pstverb 2.27 2012-03-11 - activate \tx@strokeopacity for \psgrid diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf index 7b5907d74fd..04fe319386a 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf and b/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf differ diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 632e593ebe2..f8db856d40f 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -71,7 +71,7 @@ \def\XKV@tempa{\def#1{#2}}% \fi % \in@{,#2,}{,#3,}% -\begingroup\edef\x{\endgroup\noexpand\in@{,#2,}}\x{,#3,} +\begingroup\edef\x{\endgroup\noexpand\in@{,#2,}}\x{,#3,}% %\expandafter\in@\expandafter{\expandafter,#2,}{,#3,}% --- hv 2012-04-27 %\typeout{=====>foo<=====}% \ifin@ @@ -94,8 +94,8 @@ \catcode`\@=\PstAtCode\relax \ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi % -\def\fileversion{2.28} -\def\filedate{2012/05/24} +\def\fileversion{2.29} +\def\filedate{2012/06/04} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -1590,8 +1590,8 @@ \ignorespaces% } \def\begin@OpenObj{% - \begin@ClosedObj - \let\pst@linetype\pst@arrowtype + \begin@ClosedObj% + \let\pst@linetype\pst@arrowtype% \pst@addarrowdef% } \def\begin@AltOpenObj{% @@ -3162,22 +3162,20 @@ pop % \def\psarc{\pst@object{psarc}} \def\psarc@i{\@ifnextchar({\psarc@iii}{\psarc@ii}} -\def\psarc@ii#1{\addto@par{arrows=#1}% - \@ifnextchar(\psarc@iii{\psarc@iii(0,0)}% -} +\def\psarc@ii#1{\addto@par{arrows=#1}\@ifnextchar(\psarc@iii{\psarc@iii(0,0)}} \def\psarc@iii(#1)#2#3#4{% - \begin@OpenObj - \pst@getangle{#3}\pst@tempa - \pst@getangle{#4}\pst@tempb - \ifx\pst@tempa\pst@tempb \else + \begin@OpenObj% + \pst@getangle{#3}\pst@tempa% + \pst@getangle{#4}\pst@tempb% + \ifx\pst@tempa\pst@tempb\else% \pst@@getcoor{#1}% \pssetlength\pst@dima{#2}% \addto@pscode{\psarc@iv \psarc@v - \ifPst@variableLW \pst@flattenpath \fi + \ifPst@variableLW \pst@flattenpath \fi }% \gdef\psarc@type{0}% - \showpointsfalse - \fi + \showpointsfalse% + \fi% \end@OpenObj% } \def\psarc@iv{% @@ -3318,9 +3316,8 @@ pop % \def\psellipticarc{\def\pst@par{}\pst@object{psellipticarc}} \def\psellipticarc@i{\let\if@psarcn\iffalse\psellipticarc@ii} -% \define@boolkey[psset]{pstricks}[Pst@]{correctAngle}[true]{} -\psset{correctAngle=true} +\psset{correctAngle} \let\if@psarcn\iffalse \def\psellipticarc@ii{\pst@getarrows\psellipticarc@iii} @@ -3328,7 +3325,7 @@ pop \@ifnextchar({\psellipticarc@iv(#1)}{\psellipticarc@iv(0,0)(#1)}} \def\psellipticarc@iv(#1)(#2)#3#4{% % \addbefore@par{correctAngle=false} - \begin@OpenObj + \begin@OpenObj% \pst@getcoor{#1}\pst@tempa% origin \pst@getcoor{#2}\pst@tempb% a,b \pst@getangle{#3}\pst@tempc% start angle @@ -3336,7 +3333,7 @@ pop \addto@pscode{\psellipticarc@definearg \psellipticarc@draw \ifPst@variableLW \pst@flattenpath \fi }% - \showpointsfalse + \showpointsfalse% \end@OpenObj% } \def\psellipticarc@definearg{% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 32291fb555b..8320a024660 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -76,6 +76,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'adforn', "&MAKEcopy", 'adfsymbols', "&MAKEcopy", 'adobe-euro', "die, skipping, support for nonfree fonts", + 'adobecaslon', "die, skipping, support for nonfree fonts", 'adrlist', "die 'skipping, noinfo license'", 'ae', "&MAKEae", 'aeb_mlink', "die 'skipping, per author (dps) request'", -- cgit v1.2.3