diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.dvips | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.latex | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/dvips/pstricks/pst-algparser.pro | 34 | ||||
| -rw-r--r-- | Master/texmf-dist/dvips/pstricks/pstricks.pro | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 6 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 |
7 files changed, 49 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips index 14ec1bfdf2b..5168b8fd942 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips @@ -1,4 +1,6 @@ ---- pstricks.pro +1.09 2011-10-31 - take values Ox and Oy into account for + plot styles LineToXAxis and LineToYAxis 1.08 2011-07-09 - added sibroutine DotFill 1.07 2010-04-30 - take \psk@rot into account for \psellipse - new helper function concatstring @@ -31,6 +33,8 @@ ---- pst-algparser.pro +0.04 2011-10-31 - add !/fact/Fact for the factorial function +0.03 2010-10-10 - cosmetics 0.02 2008-08-02 - commented out empty lines - add EXP func ( same as exp ) 0.01 2008-01-01 initial version (hv) diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex index eb8f7da39ca..4c93a26d20d 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex @@ -1,4 +1,5 @@ pstricks.sty -------- +0.52 2011-10-31 - update version number for pro files 0.51 2011-08-01 - revert test for pdflatex / lualatex 0.50 2011-04-23 - message for pst-tools.pro 0.49 2011-03-26 - test for pdflatex/lualatex diff --git a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro index c9009a9f623..1d5fb04c661 100644 --- a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro +++ b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro @@ -1,7 +1,7 @@ -% $Id: pst-algparser.pro 532 2011-07-09 13:02:57Z herbert $ +% $Id: pst-algparser.pro 594 2011-10-31 18:13:18Z herbert $ %% %% PostScript prologue for PSTricks algorithm parser -%% Version 0.03, 2011/06/03 +%% Version 0.04, 2011/10/21 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -13,11 +13,14 @@ % /tx@CoreAnalyzerDict 100 dict def tx@CoreAnalyzerDict begin % -% PS ANALYZER FOR ALGEBRAIC EXPRESSION V1.12 +% PS ANALYZER FOR ALGEBRAIC EXPRESSION V1.13 +% +% 09/2011 DR factorial with ! added +% % E->T|E+T % T->FS|T*FS % FS -> F | +FS | -FS -% F->P|F^SF +% F->P|F^SF|P! % P->(E)|literal % literal->number|var|var[E]|func(params) % params->E|E,param @@ -82,12 +85,16 @@ ifelse AnalyzePostHook } def %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% F->P|F^P +%% F->P|F^P|P! %% STR index /AnalyzeFactor { AnalyzePreHook AnalyzePower IsEndingFactor { dup 0 ne { 32 eq { NextNonBlankChar } if } { pop } ifelse } - { { RollOp 1 add NextNonBlankChar pop AnalyzePower PreEvalHook EvalPower IsEndingFactor { pop exit } if} loop } + { { dup 33 eq%% is there a ! DR 09/2011 + { pop 1 add NextNonBlankChar pop EvalFactorial } + { RollOp 1 add NextNonBlankChar pop AnalyzePower PreEvalHook EvalPower } + ifelse + IsEndingFactor { pop exit } if } loop } ifelse AnalyzePostHook } def %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -227,6 +234,10 @@ end /ExpressionVector ExpressionVector aload length dup 5 add -1 roll pop /exp cvx exch 1 add array astore def } def +/EvalFactorial {% DR 09/2011 + /ExpressionVector ExpressionVector aload length + /fact cvx exch 1 add array astore def +} def /EvalLiteral {% ReadLiteral dup 40 eq%%% there is an open par -> function call @@ -492,6 +503,13 @@ end %tx@CoreAnalyzerDict mark 11 -5 roll cleartomark 2 index 6 index dup 4 index exch sub getinterval exch 6 2 roll } def %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% No derivative for factorial ! only cst => null derivative +/EvalFactorial {% DR 09/2011 + 4 index (0) eq + { (0) mark 8 -2 roll cleartomark 2 index 7 index dup 4 index exch sub getinterval exch 6 2 roll } + { DERIVATIVE_ENGINE_ERROR_no_variable_in_factorial } ifelse +} def +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% str -> true/false /IsStrNumber {% true exch @@ -507,7 +525,7 @@ end %tx@CoreAnalyzerDict ReadLiteral dup 40 eq%%% there is an open par -> function call { pop (EvalFunc_ ) 9 4 index StrConcat 0 exch getinterval cvn cvx exec } { dup 91 eq%%% there is an open bracket -> vector element - { ERROR_vector_not_yet_implemented } + { DERIVATIVE_ENGINE_ERROR_vector_not_yet_implemented } { pop EvalVariable } ifelse } ifelse @@ -567,7 +585,7 @@ end %tx@CoreAnalyzerDict { dup 0 eq { (1) StrConcat } { 1 sub } ifelse (/\(2*sqrt\() StrConcat 5 index StrConcat (\)\)) StrConcat } if PostCommonFunc } def /EvalFunc_Fact {% - PreCommonFunc { ERROR_no_variable_expression_in_Fact } if + PreCommonFunc { DERIVATIVE_ENGINE_ERROR_no_variable_expression_in_Fact } if PostCommonFunc } def /EvalFunc_sh {% PreCommonFunc diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index 7f7f985e95f..a91ca474cff 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,7 +1,7 @@ -% $Id: pstricks.pro 532 2011-07-09 13:02:57Z herbert $ +% $Id: pstricks.pro 594 2011-10-31 18:13:18Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.08, 2011/07/09 +%% Version 1.09, 2011/10/31 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -375,25 +375,27 @@ tx@Dict begin } def % /LineToYAxis { + /Ox ED % Save the x origin value NArray % all x-y pairs on stack n { 2 copy moveto % go to current point - 0 exch Lineto % line to y-axis + Ox exch Lineto % line to y-axis pop % delete old x-value } repeat } def % /LineToXAxis{ + /Oy ED % Save the y origin value NArray % all x-y pairs on stack n 0 eq not { n 1 eq { 0 0 /n 2 def } if ArrowA /n n 2 sub def - CP 2 copy moveto pop 0 Lineto - n { 2 copy moveto pop 0 Lineto } repeat + CP 2 copy moveto pop Oy Lineto + n { 2 copy moveto pop Oy Lineto } repeat CP 4 2 roll ArrowB - 2 copy moveto pop 0 + 2 copy moveto pop Oy L pop pop } if } def diff --git a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg index 30f36c74b7e..7da112624ad 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg @@ -65,23 +65,27 @@ \hbox to \z@{\box\pst@hbox\hss}% \special{x: escale}% \ifdim\pst@dima>\z@\kern\pst@dima\fi}} +% \let\ps@@scalebox\@@scalebox \def\ps@rotateleft#1{% \leavevmode\hbox{\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1% \pst@Verb{90 \tx@RotBegin} \vbox to \z@{\vss\hbox to \z@{\box#1\hss}\vskip\z@}% \pst@Verb{\tx@RotEnd}}}} +% \def\ps@rotateright#1{% \leavevmode\hbox{% \hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1% \pst@Verb{-90 \tx@RotBegin} \vbox to \z@{\hbox to \z@{\hss\box#1}\vss}% \pst@Verb{\tx@RotEnd}}}} +% \def\ps@rotatedown#1{% \hbox{\hskip\wd#1\vbox{\vskip\ht#1\vskip\dp#1% \pst@Verb{180 \tx@RotBegin}% \vbox to \z@{\hbox to \z@{\box#1\hss}\vss}% \pst@Verb{\tx@RotEnd}}}} +% \def\begin@psclip{\special{x: gsave}} \def\end@psclip{\special{x: grestore}} \def\@newcolor#1#2#3{% @@ -89,6 +93,7 @@ \expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 \expandafter\edef\csname\string\color@xetex@#1\endcsname{#3}% \ignorespaces} +% \def\newgray#1#2{% \pst@checknum{#2}\pst@tempg \@newcolor{#1}{\pst@tempg setgray}{gray \pst@tempg}% @@ -141,6 +146,7 @@ % \def\putoverlaybox#1{% \hbox{\special{x: gsave}\special{x: initoverlay #1}\copy\theoverlaybox\special{x: grestore}}} +% \def\pst@overlay#1{\edef\curr@overlay{#1}\special{x: clipoverlay #1}\aftergroup\pst@endoverlay} \def\pst@endoverlay{\special{x: clipoverlay \curr@overlay}} \def\AltOverlayMode{} diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index f6d9bb48080..56b72ef7096 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty @@ -16,7 +16,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pstricks} - [2011/08/201 v0.51 LaTeX wrapper for `PSTricks' (RN,HV)] + [2011/10/31 v0.52 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -94,11 +94,11 @@ [\filedate\space v\fileversion\space `PST-fp' (hv)] \IfFileExists{pstricks.pro}{% \ProvidesFile{pstricks.pro} - [2010/04/24 v. 1.07, PostScript prologue file (hv)] + [2011/10/31 v. 1.08, PostScript prologue file (hv)] \@addtofilelist{pstricks.pro}}{}% \IfFileExists{pst-algparser.pro}{% \ProvidesFile{pst-algparser.pro} - [2008/01/01 v. 0.01, PostScript prologue file (hv)] + [2011/10/31 v. 0.04, PostScript prologue file (hv)] \@addtofilelist{pst-algparser.pro}}{}% \IfFileExists{pst-tools.pro}{% \ProvidesFile{pst-tools.pro} diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index ae175ecdf9b..3989282d07a 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -388,7 +388,7 @@ my @TLP_working = qw( translation-array-fr translation-arsclassica-de translation-biblatex-de translation-chemsym-de translation-dcolumn-fr - translation-enumitem-de translation-europecv-de translation-evc-de + translation-enumitem-de translation-europecv-de translation-ecv-de translation-filecontents-de translation-moreverb-de translation-tabbing-fr tree-dvips trfsigns trimspaces trivfloat trsym truncate tsemlines |