summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-02-02 21:54:34 +0000
committerKarl Berry <karl@freefriends.org>2014-02-02 21:54:34 +0000
commit02a4fc71679895429385a94acdbd1f9f37a23b13 (patch)
treeb837ad5edc38aafc0bc832178a015eb3e9c522c9 /Master/texmf-dist
parent72e8e6ddb9402812e9f0bf1920bba7dd00bd2a36 (diff)
pst-func (2feb14)
git-svn-id: svn://tug.org/texlive/trunk@32849 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pst-func/Changes2
-rw-r--r--Master/texmf-dist/doc/generic/pst-func/README3
-rw-r--r--Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdfbin3356988 -> 3369725 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex34
-rw-r--r--Master/texmf-dist/dvips/pst-func/pst-func.pro20
-rw-r--r--Master/texmf-dist/source/generic/pst-func/Makefile69
-rw-r--r--Master/texmf-dist/tex/generic/pst-func/pst-func.tex23
7 files changed, 69 insertions, 82 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-func/Changes b/Master/texmf-dist/doc/generic/pst-func/Changes
index a66479753f4..14637921791 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.77 2014-02-01 - added \psWeierstrass
0.76 2012-01-13 - modifications to \psImpPlot
0.75 2012-01-01 - moved \psPrintValue into pst-tools
0.74 2011-11-02 - make \psLorenz work in a correct way
@@ -90,6 +91,7 @@
..... pst-func.pro
+0.15 2013-06-10 - fix bug with wrong arrow in psBezier#
0.14 2013-06-03 - fix bug with arrow in psBezier#
0.13 2010-06-21 - run FindZeros in a local dictionary
- return [zeros] on stack
diff --git a/Master/texmf-dist/doc/generic/pst-func/README b/Master/texmf-dist/doc/generic/pst-func/README
index 5c3df64feeb..11083f2897c 100644
--- a/Master/texmf-dist/doc/generic/pst-func/README
+++ b/Master/texmf-dist/doc/generic/pst-func/README
@@ -22,6 +22,7 @@ pst-func: plotting special mathematical functions:
-- psWeibull for Weibull distribution
-- psLame (Lam\`e\ Curve -- a superellipse)
-- psThomae (popcorn function)
+-- psWeierstrass
-- psplotImp (plotting implicit defined functions)
-- psVolume (rotating f(x) around the x-axis)
-- psPrintValue
@@ -42,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 286 2010-02-11 09:40:41Z herbert $
+%% $Id: README 885 2014-02-01 17:13:34Z 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
index 3d5db3c7289..11513d64057 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
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex
index 87fd1e143dd..2aec2a646d3 100644
--- a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-func-doc.tex 769 2013-04-18 08:53:32Z herbert $
+%% $Id: pst-func-doc.tex 884 2014-02-01 17:09:26Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
smallheadings, headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
@@ -1612,6 +1612,38 @@ The plotted number of points is the third parameter.
\end{pspicture}
\end{LTXexample}
+
+\clearpage
+\section{\nxLcs{psWeierstrass} -- a pathological function}
+
+The Weierstrass function is an example of a pathological real-valued function
+on the real line. The function has the property that it is continuous
+everywhere but differentiable nowhere.
+%
+\[
+ f_a(x)=\sum\limits_{k=1}^\infty\frac{\sin(\pi k^ax)}{\pi k^a}
+\]
+%f(p/q)=pi/(4q^2)sum_(k=1)^(q-1)(sin((k^2ppi)/q))/(sin^2((kpi)/(2q)))
+%
+
+\begin{BDef}
+\Lcs{psWeierstrass}\OptArgs\Largr{$x_0,x_1$}\Largb{a}
+\end{BDef}
+
+\begin{LTXexample}[width=6.5cm,wide=false]
+\psset{yunit=10,xunit=5}
+\begin{pspicture}(-0.1,-0.5)(2.1,0.5)
+\psaxes[Dx=0.2,Dy=0.1,ticksize=-4pt 0,
+ labelFontSize=\scriptstyle]{->}(0,0)(0,-0.5)(2.1,0.5)
+\psWeierstrass[linecolor=red](0,2){2}
+\psWeierstrass[linecolor=green](0,2){3}
+\psWeierstrass[linecolor=blue](0,2){4}
+\end{pspicture}
+\end{LTXexample}
+
+
+
+
\clearpage
\section{\nxLcs{psplotImp} -- plotting implicit defined functions}
For a given area, the macro calculates in a first step row by row for every pixel (1pt)
diff --git a/Master/texmf-dist/dvips/pst-func/pst-func.pro b/Master/texmf-dist/dvips/pst-func/pst-func.pro
index 0ea724d8439..6bbdb70d79c 100644
--- a/Master/texmf-dist/dvips/pst-func/pst-func.pro
+++ b/Master/texmf-dist/dvips/pst-func/pst-func.pro
@@ -1,4 +1,4 @@
-%% $Id: pst-func.pro 786 2013-06-03 07:28:54Z herbert $
+%% $Id: pst-func.pro 789 2013-06-10 13:50:35Z herbert $
%%
%% This is file `pst-func.pro',
%%
@@ -16,7 +16,7 @@
%% `pst-func' is a PSTricks package to plot special math functions
%%
%%
-%% version 0.14 / 2013-06-03 Herbert Voss
+%% version 0.15 / 2013-06-10 Herbert Voss
%
/tx@FuncDict 100 dict def
tx@FuncDict begin
@@ -77,16 +77,20 @@ tx@FuncDict begin
/BezierCurve { % on stack [ coors psk@plotpoints BezierType
% 10 dict begin
- /BezierType ED
- 1 exch div /epsilon ED
- ] /Points ED % yi xi ... y3 x3 y2 x2 y1 x1 y0 x0
+ /BezierType ED % 2,3,4,5,6,...
+ 1 exch div /epsilon ED % step for Bezier =1/plotpoints
+ ] % [ yi xi ... y3 x3 y2 x2 y1 x1 y0 x0]
+ ps@ReverseOrderOfPoints % [y0 x0 y1 x1 ... yi xi]
+ /Points ED % save Points array
epsilon GetBezierCoor % next Bezier point
Points 0 get Points 1 get % starting point
- ArrowA moveto
- epsilon dup 1 epsilon sub { /t ED t GetBezierCoor lineto } for
+ ArrowA lineto
+ epsilon epsilon 1 epsilon sub { % on stack is the loop variable
+ GetBezierCoor lineto
+ } for
1 epsilon sub GetBezierCoor
1 GetBezierCoor
- ArrowB lineto moveto
+ ArrowB lineto moveto
% end
} def
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 d24eb4d699f..00000000000
--- a/Master/texmf-dist/source/generic/pst-func/Makefile
+++ /dev/null
@@ -1,69 +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
-doc: $(MAIN).pdf
-
-$(MAIN).pdf : $(MAIN).ps
- GS_OPTIONS=-dAutoRotatePages=/None 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)/
-
-# 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 61a731c32bc..3ced97eacaf 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 625 2012-01-15 20:56:13Z herbert $
+%% $Id: pst-func.tex 883 2014-02-01 16:47:25Z herbert $
%%
%% This is file `pst-func.tex',
%%
@@ -30,8 +30,8 @@
% interface to the `xkeyval' package
\pst@addfams{pst-func}
%
-\def\fileversion{0.76}
-\def\filedate{2012/01/13}
+\def\fileversion{0.77}
+\def\filedate{2014/02/01}
\message{`PST-func' v\fileversion, \filedate\space (hv)}
%
\pstheader{pst-func.pro}
@@ -944,6 +944,23 @@
t 180 gt { neg } if }
\endgroup\ignorespaces}
%
+\def\psWeierstrass{\pst@object{psWeierstrass}}
+\def\psWeierstrass@i(#1,#2)#3{%
+ \addbefore@par{plotpoints=500}%
+ \begin@SpecialObj
+ \psplot{#1}{#2}{
+ /ps@a #3 def
+ /ps@k 1 def
+ /ps@WS 0 def
+ {
+ ps@k ps@a exp Pi mul dup x mul RadtoDeg sin exch div
+ dup abs 1e-8 gt { ps@WS add /ps@WS ED }{ ps@WS add exit } ifelse
+ ps@k 1 add /ps@k ED
+ } loop
+ }
+ \end@SpecialObj
+}
+%
% For polar plots
%\define@boolkey[psset]{pst-func}[PstAdd@]{polarplot}[true]{}
%\psset[pst-func]{polarplot=false}