diff options
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.generic | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf | bin | 98599 -> 98780 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data | 4 | ||||
-rw-r--r-- | Master/texmf-dist/dvips/pstricks/pstricks.pro | 30 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 67 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 4 |
6 files changed, 56 insertions, 51 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic index a49cc79388e..3444dc7a382 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic @@ -1,4 +1,6 @@ pstricks.tex -------- +2.33 2012-09-23 - fix a trailing space in \pst@Pyth +2.32 2012-09-20 - added more blendmodes for distiller 2.31 2012-08-24 - fixed bug with the star version of \psellipticarc and the additional setting of showpoints 2.30 2012-08-13 - fixed bug with the star version of \psellipticarc diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf Binary files differindex 0dffe5567d6..0ccdf413c5d 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news12.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data deleted file mode 100644 index 8bd09389cc7..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data +++ /dev/null @@ -1,4 +0,0 @@ -some nonsense in this line ---time forcex forcey -0 0.2 -1 1 -2 4 diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index 2eb173e8949..282032abc0d 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,7 +1,7 @@ % $Id: pstricks.pro 700 2012-08-13 21:04:25Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.15, 2012/08/24 +%% Version 1.16, 2012/09/07 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -14,6 +14,21 @@ systemdict /.setopacityalpha known not {/.setopacityalpha { pop } def } if systemdict /.setblendmode known not {/.setblendmode { pop } def } if systemdict /.setshapealpha known not {/.setshapealpha { pop } def } if % +/PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian +/setRand { realtime srand } def +/Rand { rand 4294967295 div } def % a real random number +/Pyth { dup mul exch dup mul add sqrt } def % Pythagoras, expects 2 parameter +/Pyth2 { % Pythagoras, xA yA xB yB + 3 -1 roll % xA xB yB yA + sub % xA xB yB-yA + 3 1 roll % yB-yA xA xB + sub % yB-yA xA-xB + Pyth } def +/RadtoDeg { 180 mul Pi div } bind def % convert from radian to degrees +/DegtoRad { Pi mul 180 div } bind def % viceversa +/Acos {dup dup mul neg 1 add dup 0 lt { % arc cos, returns 0 when negative root + pop pop 0 }{ sqrt exch atan} ifelse } def +% /tx@Dict 200 dict def % the main PSTricks dictionary tx@Dict begin /ADict 25 dict def % The arrow dictionaray @@ -38,18 +53,7 @@ tx@Dict begin { dup sin exch cos div } ifelse % default sin/cos } def /Tan { dup sin exch cos Div } def % sin(x)/cos(x) x in degrees -/Acos {dup dup mul neg 1 add dup 0 lt { % arc cos, returns 0 when negative root - pop pop 0 }{ sqrt exch atan} ifelse } def /NET { neg exch neg exch T } def % change coordinate system to the negative one -/Pyth { dup mul exch dup mul add sqrt } def % Pythagoras, expects 2 parameter -/Pyth2 { % Pythagoras, xA yA xB yB - 3 -1 roll % xA xB yB yA - sub % xA xB yB-yA - 3 1 roll % yB-yA xA xB - sub % yB-yA xA-xB - Pyth } def -/PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian -/Rand { rand 4294967295 div } def % a real random number %----------------- hv added 20050516 --------------- /PiDiv2 1.57079632680 def /Pi 3.14159265359 def @@ -57,8 +61,6 @@ tx@Dict begin /Euler 2.71828182846 def %/e Euler bind def % -/RadtoDeg { 180 mul Pi div } bind def % convert from radian to degrees -/DegtoRad { Pi mul 180 div } bind def % viceversa %----------------- hv end--------------------------- /PathLength@ { /z z y y1 sub x x1 sub Pyth add def /y1 y def /x1 x def } def % diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 5e55998297f..de5412134e5 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -94,8 +94,8 @@ \catcode`\@=\PstAtCode\relax \ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi % -\def\fileversion{2.31} -\def\filedate{2012/08/24} +\def\fileversion{2.33} +\def\filedate{2012/09/23} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -346,11 +346,11 @@ } % \def\pst@pyth#1#2#3{% from pst-3d - \begingroup - \pst@dima=#1\relax - \ifnum\pst@dima<\z@\pst@dima=-\pst@dima\fi % dima=abs(x) - \pst@dimb=#2\relax - \ifnum\pst@dimb<\z@\pst@dimb=-\pst@dimb\fi % dimb=abs(y) + \begingroup% + \pst@dima=#1\relax% + \ifnum\pst@dima<\z@\pst@dima=-\pst@dima\fi% dima=abs(x) + \pst@dimb=#2\relax% + \ifnum\pst@dimb<\z@\pst@dimb=-\pst@dimb\fi% dimb=abs(y) \advance\pst@dimb\pst@dima % dimb=s=abs(x)+abs(y) \ifnum\pst@dimb=\z@ \global\pst@dimg=\z@ % dimg=z=sqrt(x^2+y^2) @@ -380,7 +380,7 @@ % ----- the old pst@pyth begin ----- did not use dimens \def\pst@Pyth#1#2#3{\ifdim#1>#2\pst@@Pyth#1#2#3\else\pst@@Pyth#2#1#3\fi} \def\pst@@Pyth#1#2#3{% - \ifdim4#1>9#2 + \ifdim4#1>9#2\relax #3=#1\advance#3 .2122#2% \else #3=.8384#1\advance#3 .5758#2% @@ -1126,8 +1126,11 @@ /Normal \or /Compatible \or /Screen \or - /Multiply %\or -% /Hardlight + /Multiply \or + /HardLight \or + /Darken \or + /Ligten \or + /Difference \else /Normal \fi @@ -2909,27 +2912,27 @@ \def\pscirclebox{\pst@object{pscirclebox}} \def\pscirclebox@i{\pst@makebox\pscirclebox@ii} \def\pscirclebox@ii{% -\begingroup -\pst@useboxpar +\begingroup% +\pst@useboxpar% \setbox\pst@hbox=\hbox{% -\pst@nodehook -\pscirclebox@iii +\pst@nodehook% +\pscirclebox@iii% \box\pst@hbox}% -\ifpsboxsep \pscirclebox@sep \fi -\leavevmode -\box\pst@hbox +\ifpsboxsep\pscirclebox@sep\fi% +\leavevmode% +\box\pst@hbox% \endgroup} % \def\pscirclebox@iii{% - \if@star - \pslinewidth\z@ + \if@star% + \pslinewidth\z@% \pstverb{\pst@dict \tx@STP \pst@usecolor\psfillcolor newpath \pscirclebox@iv \tx@SD end}% - \else - \begin@ClosedObj - \def\pst@linetype{4}\showpointsfalse + \else% + \begin@ClosedObj% + \def\pst@linetype{4}\showpointsfalse% \addto@pscode{ \pscirclebox@iv\space CLW 2 div add 0 360 arc closepath}% - \end@ClosedObj + \end@ClosedObj% \fi} % \def\pscirclebox@iv{ @@ -2939,16 +2942,16 @@ \tx@Pyth \pst@number\psframesep add } % \def\pscirclebox@sep{% - \pst@dimn=\ht\pst@hbox - \advance\pst@dimn by \dp\pst@hbox - \divide\pst@dimn by 2 - \pst@dimm=0.5\wd\pst@hbox - \pst@Pyth\pst@dimm\pst@dimn\pst@dimo - \advance\pst@dimo by \pslinewidth - \advance\pst@dimo by \psframesep - \advance\pst@dimn by -\pst@dimo + \pst@dimn=\ht\pst@hbox% % the height of the box + \advance\pst@dimn by \dp\pst@hbox% % the depth of the box added to \pst@dimn + \divide\pst@dimn by 2% % \pst@dimn/2 + \pst@dimm=0.5\wd\pst@hbox% % the half of the width + \pst@Pyth\pst@dimm\pst@dimn\pst@dimo% % the diameter + \advance\pst@dimo by \pslinewidth% + \advance\pst@dimo by \psframesep% + \advance\pst@dimn by -\pst@dimo% \setbox\pst@hbox=\hbox to 2\pst@dimo{\hss\vbox{\kern-\pst@dimn\box\pst@hbox}\hss}% - \advance\pst@dimn by -\dp\pst@hbox + \advance\pst@dimn by -\dp\pst@hbox% \dp\pst@hbox=-\pst@dimn} % \let\pst@nodehook\relax diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 0ace2808d8d..0551a427366 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -211,7 +211,8 @@ my @TLP_working = qw( ijmart ijqc imac image-gallery imakeidx impatient impatient-fr impnattypo import imsproc imtekda - incgraph inconsolata index inlinebib inlinedef inputtrc insbox installfont + incgraph inconsolata index initials inlinebib inlinedef + inputtrc insbox installfont interactiveworkbook interfaces interpreter intro-scientific inversepath invoice ionumbers iopart-num ipaex iso @@ -538,6 +539,7 @@ my @TLP_no_check = ( "texworks", # binary "tie", # binary "ttfutils", # binary + "uptex", # binary "web", # binary "xdvi", # binary "xetex", # binary |