From 54709c78e04108450e0dc9f08277c7c9bf11db6c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 9 Dec 2014 23:18:21 +0000 Subject: pstricks-add (9dec14) git-svn-id: svn://tug.org/texlive/trunk@35772 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pstricks-add/Changes | 3 +- .../doc/generic/pstricks-add/pstricks-add-doc.pdf | Bin 5062733 -> 5189609 bytes .../tex/generic/pstricks-add/pstricks-add.tex | 41 ++++++++++++++------- Master/tlpkg/bin/tlpkg-ctan-check | 4 +- Master/tlpkg/bin/tlpkginfo | 1 + Master/tlpkg/libexec/ctan2tds | 2 +- 6 files changed, 33 insertions(+), 18 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes index 06ed4924c88..3f5561567cc 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/Changes +++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes @@ -1,4 +1,4 @@ -%% $Id: Changes 134 2014-11-29 21:09:24Z herbert $ +%% $Id: Changes 136 2014-12-08 20:07:44Z herbert $ %% pstricks-add.pro ----------- 0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY @@ -39,6 +39,7 @@ pstricks-add.sty ----------- (hv) pstricks-add.tex ----------- (hv) + v 3.77 2014-12-08 - fix bug with sup/inf for \psStep v 3.76 2014-11-29 - fix bug with color setting and \psrotate v 3.75 2014-07-22 - use \pcline instead of \psline for \psRelLine and \psParallelLine diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf index aa3c893ab3d..b4eaa746789 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf and b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf differ diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex index 124a8819b0d..56d9ef30979 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.tex 135 2014-11-30 08:28:22Z herbert $ +%% $Id: pstricks-add.tex 137 2014-12-08 20:17:43Z herbert $ %% %% This is file `pstricks-add.tex', %% @@ -30,8 +30,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\PSTmathLoaded\endinput\else \input pst-math \fi % -\def\fileversion{3.76} -\def\filedate{2014/11/29} +\def\fileversion{3.77} +\def\filedate{2014/12/08} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -1377,12 +1377,18 @@ a add \or % 3->inf(imum) x scx 0 moveto #3 { - \ifPst@algebraic Func \else #4 \fi /y0 ED % left value f(x) - /xOld x def - /x x dx add def - \ifPst@algebraic Func \else #4 \fi /y1 ED % right value f(x+dx) - y0 y1 lt { y0 }{ y1 } ifelse % use infimum - scy dup xOld scx exch \ifPst@noVerticalLines moveto \else lineto \fi + \ifPst@algebraic Func \else #4 \fi /yMin ED % Max value f(x) + /xStart x def + /xEnd xStart dx add def + /DX dx 100 div def + xStart DX xEnd { + /x ED + \ifPst@algebraic Func \else #4 \fi /yVal ED + yVal yMin lt { /yMin yVal def } if + } for +% y0 y1 gt { y0 }{ y1 } ifelse % use supremum + /x xEnd def + yMin scy dup xStart scx exch \ifPst@noVerticalLines moveto \else lineto \fi x scx exch lineto x scx 0 \ifPst@noVerticalLines moveto \else lineto \fi closepath x scx 0 moveto @@ -1390,11 +1396,18 @@ a add \or % 4-> sup(remum) x scx 0 moveto #3 { - \ifPst@algebraic Func \else #4 \fi /y0 ED % left value f(x) - /x x dx add def - \ifPst@algebraic Func \else #4 \fi /y1 ED % right value f(x+dx) - y0 y1 gt { y0 }{ y1 } ifelse % use supremum - scy dup x dx sub scx exch \ifPst@noVerticalLines moveto \else lineto \fi + \ifPst@algebraic Func \else #4 \fi /yMax ED % Max value f(x) + /xStart x def + /xEnd xStart dx add def + /DX dx 100 div def + xStart DX xEnd { + /x ED + \ifPst@algebraic Func \else #4 \fi /yVal ED + yVal yMax gt { /yMax yVal def } if + } for +% y0 y1 gt { y0 }{ y1 } ifelse % use supremum + /x xEnd def + yMax scy dup xStart scx exch \ifPst@noVerticalLines moveto \else lineto \fi x scx exch lineto x scx 0 \ifPst@noVerticalLines moveto \else lineto \fi closepath x scx 0 moveto diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index c53815d65b1..bbb42fde9f1 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -319,7 +319,7 @@ my @TLP_working = qw( lxfonts ly1 m-tx macros2e macroswap mafr magaz mailing mailmerge makebarcode makebox makecell makecirc makecmds makedtx makeglos makeplot - makeshape mandi manuscript margbib + makeshape mandi manfnt manuscript margbib marginfix marginnote marvosym matc3 matc3mem match_parens math-e mathabx mathabx-type1 mathalfa mathastext @@ -332,7 +332,7 @@ my @TLP_working = qw( metafont-beginners metago metalogo metaobj metaplot metapost-examples metatex metauml method metre metrix - mf2pt1 mfnfss mfpic mfpic4ode mftinc mhchem + mf2pt1 mflogo-font mfnfss mfpic mfpic4ode mftinc mhchem mhequ microtype microtype-de midnight midpage mil3 miller minibox minifp minipage-marginpar miniplot minitoc minorrevision minted mintspirit minutes diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 43849f4e78d..501fdab63fb 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -153,6 +153,7 @@ sub find_ctan_dir { # names totally dissimilar $ctan_dir = "fonts/fourier-GUT" if $me eq "fourier"; + $ctan_dir = "fonts/manual/ps-type1/hoekwater" if $me eq "manfnt-font"; $ctan_dir = "graphics/pdftex" if $me eq "pdftex-def"; $ctan_dir = "info/biblio" if $me eq "beebe"; $ctan_dir = "info/epslatex/french" if $me eq "epslatex-fr"; diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 5f222041877..70644463963 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -634,6 +634,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'makor', "&MAKEbase", 'malayalam-latex', "die 'skipping, until asked for'",#language/malayalam 'malayalam-omega', "die 'skipping, until asked for'", + 'manfnt-font', "&MAKEflatten", 'manjutex', "die 'skipping, obsolete on CTAN'", #"&MAKEflatten", 'manpage', "die 'skipping, nonfree license'", 'mapcodes', "die 'skipping, nosell (old latex) license'", @@ -663,7 +664,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'metaobj', "&MAKEflatten", 'metapost', "die 'skipping, core binary'", 'metauml', "&MAKEmetauml", - 'mflogo', "die 'skipping, TL conflates distinct mflogo pkgs on CTAN'", 'mff', "die 'skipping, noinfo license'", 'mftoeps', "die 'skipping, bat-only (mirror.ctan.org/graphics/MF-PS)'", 'mfpic', "&MAKEcopy", -- cgit v1.2.3