diff options
author | Karl Berry <karl@freefriends.org> | 2014-03-21 22:58:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-03-21 22:58:06 +0000 |
commit | 959ce7d977a53f679382b123caf58b8acce4f06b (patch) | |
tree | 218798a758d33708099dd4cacbea2ff910050a41 /Master | |
parent | fb3b8219c1ee881895924996ae07451090d5c2a3 (diff) |
pst-func (21mar14)
git-svn-id: svn://tug.org/texlive/trunk@33251 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-func/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-func/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf | bin | 3381609 -> 3384351 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/generic/pst-func/Makefile | 87 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-func/pst-func.tex | 31 |
5 files changed, 24 insertions, 97 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-func/Changes b/Master/texmf-dist/doc/generic/pst-func/Changes index f3204955d54..8aa33af14e2 100644 --- a/Master/texmf-dist/doc/generic/pst-func/Changes +++ b/Master/texmf-dist/doc/generic/pst-func/Changes @@ -1,4 +1,5 @@ ..... pst-func.tex +0.79 2014-03-21 - allow option algebraic for \psVolume 0.78 2014-02-03 - added \psWeierstrass as original defined 0.77 2014-02-01 - added \psWeierstrass 0.76 2012-01-13 - modifications to \psImpPlot diff --git a/Master/texmf-dist/doc/generic/pst-func/README b/Master/texmf-dist/doc/generic/pst-func/README index 71046634ac5..b334190ce1b 100644 --- a/Master/texmf-dist/doc/generic/pst-func/README +++ b/Master/texmf-dist/doc/generic/pst-func/README @@ -43,4 +43,4 @@ CTAN server, http://mirror.ctan.org PSTricks is PostScript Tricks, the documentation cannot be run with pdftex, use the sequence latex->dvips->ps2pdf. -%% $Id: README 885 2014-02-01 17:13:34Z herbert $ +%% $Id: README 897 2014-03-21 08:06:41Z herbert $ diff --git a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf Binary files differindex f64f846dca8..284f88e215f 100644 --- a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf diff --git a/Master/texmf-dist/source/generic/pst-func/Makefile b/Master/texmf-dist/source/generic/pst-func/Makefile deleted file mode 100644 index ef1ca6da6f8..00000000000 --- a/Master/texmf-dist/source/generic/pst-func/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# `Makefile' for `pst-func.pdf', hv, 2006/08/11 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -PACKAGE = pst-func - -MAIN = $(PACKAGE)-doc - -LATEX = latex - -ARCHNAME = $(MAIN)-$(shell date +%y%m%d) - -ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile - -TDS = ~/PSTricks/PSTricks-TDS - -all : doc clean tds ctan -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps - GS_OPTIONS="-dAutoRotatePages=/None -dNOSAFER" ps2pdf $< - -$(MAIN).ps : $(MAIN).dvi - dvips $< - -$(MAIN).dvi : $(MAIN).tex - $(LATEX) $< - $(LATEX) $< - if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi - if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi - makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ - $(basename $<).glo - makeindex -s pst-doc.ist -t $(basename $<).ilg -o $(basename $<).ind \ - $(basename $<).idx - bibtex $(basename $<) - $(LATEX) $< - $(LATEX) $< - -clean : - $(RM) $(addprefix $(MAIN), .log .aux .bbl .blg .glg .glo .gls .ilg .idx .ind .tmp .toc .out ) - $(RM) $(addprefix $(MAIN), .dvi .ps .xcp) - -veryclean : clean - $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) - -arch : - zip $(ARCHNAME).zip $(ARCHFILES) - -tds: - cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/ - cp -u README $(TDS)/doc/generic/$(PACKAGE)/ - cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/ - cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/ - cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/dvips/$(PACKAGE)/ - cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/ - cp -u $(PACKAGE).pro ~/Links/dvips-local/ -# - cp -u Changes $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/ - cp -u Makefile $(TDS)/source/$(PACKAGE)/ - -ctan: - rm -f .ctan/$(PACKAGE)/latex/* - cp -u *.sty .ctan/$(PACKAGE)/latex/ -# cp -u *.cfg .ctan/$(PACKAGE)/latex/ - rm -f .ctan/$(PACKAGE)/tex/* - cp -u $(PACKAGE).tex .ctan/$(PACKAGE)/tex/ -# cp -u $(PACKAGE)97.tex .ctan/$(PACKAGE)/tex/ - cp -u *.pro .ctan/$(PACKAGE)/dvips/ -# cp -u more_docs/psmatrix* .ctan/$(PACKAGE)/doc/ - rm -f .ctan/$(PACKAGE)/doc/* - cp -u $(PACKAGE)-doc.* .ctan/$(PACKAGE)/doc/ -# cp -u more_docs/* .ctan/$(PACKAGE)/doc/ -# rm -fr .ctan/$(PACKAGE)/.svn - cp -u Changes .ctan/$(PACKAGE)/ - cp -u README .ctan/$(PACKAGE)/ - chmod -R a+r .ctan/$(PACKAGE) - - -# EOF diff --git a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex index 743e17c87ea..cf5c27b9d78 100644 --- a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex +++ b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex @@ -1,4 +1,4 @@ -%% $Id: pst-func.tex 892 2014-02-03 21:33:38Z herbert $ +%% $Id: pst-func.tex 897 2014-03-21 08:06:41Z herbert $ %% %% This is file `pst-func.tex', %% @@ -30,8 +30,8 @@ % interface to the `xkeyval' package \pst@addfams{pst-func} % -\def\fileversion{0.78} -\def\filedate{2014/02/03} +\def\fileversion{0.79} +\def\filedate{2014/03/21} \message{`PST-func' v\fileversion, \filedate\space (hv)} % \pstheader{pst-func.pro} @@ -1080,15 +1080,20 @@ \pst@killglue \begingroup \use@par - \psplot[algebraic=false,fillstyle=none]{#1}{#2}{#4}% original function - \psplot[algebraic=false,fillstyle=none]{#1}{#2}{#4 neg}% mirrored at the x-axis + \psplot[fillstyle=none]{#1}{#2}{#4}% original function + \ifPst@algebraic + \psplot[fillstyle=none]{#1}{#2}{-(#4)} + \else + \psplot[fillstyle=none]{#1}{#2}{#4 neg}% mirrored at the x-axis + \fi \multido{\iA=1+1}{#3}{% run it #3 times with increment \A \pscustom{% to get a closed filled ellipse \code{ % the PS code /dX #2 #1 sub #3 div def % delta x, the step /Start dX \iA\space 1 sub mul #1 add def % xStart /End Start dX add def % xEnd=xStart+dX - /Height End Start add 2 div /x ED #4 def } % height=f(x) + /Height End Start add 2 div /x ED + \ifPst@algebraic (#4) AlgParser cvx exec \else #4 \fi def } % height=f(x) % x is the mean between Start+End \psellipticarc(!Start 0)(! Height 8 div Height){90}{270} % draw the first falf of the ellipse @@ -1097,11 +1102,19 @@ % draw the other half of the ellipse \rlineto(!dX neg 0)}}% draw a line in negative x-direction \psset{fillstyle=none} - \psellipse(#2,0)(!#2 dup #1 sub #3 div 2 div sub /x ED #4 dup - 8 div exch)% draw again the ellipse to get the borderline. +% \psellipse(#2,0)(!#2 dup #1 sub #3 div 2 div sub /x ED #4 dup +% 8 div exch)% draw again the ellipse to get the borderline. + \psellipse(#2,0)(!{ #2 dup #1 sub #3 div 2 div sub /x ED + \ifPst@algebraic (#4) AlgParser cvx exec \else #4 \fi dup + 8 div exch}) % draw again the ellipse to get the borderline. \psset{plotstyle=line,linestyle=dashed, plotpoints=40,dotstyle=*,dotsize=0.5pt} - \psplot[algebraic=false]{#1}{#2}{#4}\psplot{#1}{#2}{#4 neg} + \psplot[fillstyle=none]{#1}{#2}{#4} + \ifPst@algebraic + \psplot[fillstyle=none]{#1}{#2}{-(#4)} + \else + \psplot[fillstyle=none]{#1}{#2}{#4 neg}% mirrored at the x-axis + \fi % draw again the curves to get the borderline \endgroup% \ignorespaces% |