summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-08-24 21:58:47 +0000
committerKarl Berry <karl@freefriends.org>2017-08-24 21:58:47 +0000
commitac09420035e5dca6d9e71c4565eb179c649c7d91 (patch)
tree43303e11126386917128e2e421063cb97b000139
parent385a14552c642eb259326a5a025ad2da20a2db78 (diff)
pst-fit (24aug17)
git-svn-id: svn://tug.org/texlive/trunk@45109 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pst-fit/Changes6
-rw-r--r--Master/texmf-dist/doc/generic/pst-fit/README47
-rw-r--r--Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.bib45
-rw-r--r--Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.pdfbin101201 -> 106298 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.tex9
-rw-r--r--Master/texmf-dist/source/generic/pst-fit/Makefile71
-rw-r--r--Master/texmf-dist/tex/generic/pst-fit/pst-fit.tex16
-rw-r--r--Master/texmf-dist/tex/latex/pst-fit/pst-fit.sty4
8 files changed, 35 insertions, 163 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-fit/Changes b/Master/texmf-dist/doc/generic/pst-fit/Changes
index e4341e78b86..28f6efcacd6 100644
--- a/Master/texmf-dist/doc/generic/pst-fit/Changes
+++ b/Master/texmf-dist/doc/generic/pst-fit/Changes
@@ -1,10 +1,12 @@
%% $Id: Changes 673 2012-04-01 09:50:48Z herbert $
%%
pst-fit.sty ----------- (hv)
- v. 0.01 2012-04-01 first CTAN version
+0.01 2012-04-01 first CTAN version
pst-fit.tex ----------- (bl/hv)
- v. 0.01 2012-04-01 first CTAN version
+0.02 2017-08-24 - use always URW fonts instead of PostScript,
+ eg Helvetica->NimbusSanL
+0.01 2012-04-01 - first CTAN version
diff --git a/Master/texmf-dist/doc/generic/pst-fit/README b/Master/texmf-dist/doc/generic/pst-fit/README
index f03cf6cd819..1b1c2baa84b 100644
--- a/Master/texmf-dist/doc/generic/pst-fit/README
+++ b/Master/texmf-dist/doc/generic/pst-fit/README
@@ -1,41 +1,12 @@
-pstricks-add redefines a lot of the pstricks macros.
-#
-# Do not load another PSTricks related package after pstricks-add!!
-#
-pstricks-add collects a lot of the code which was posted
-to the pstricks mailing list and has some more new features:
+ The package uses PSTricks to fit curves to:
-- pstricks
- o random dots
- O braces
- o define and calculate colors on PS side
- o Gouraud shading
- o braces as node connection/linestyle
- o line style bar
- o lines, drawn "by hand"
- o arrows, arrows, arrows, ...
+- Linear Functions;
+- Power Functions;
+- exp Function;
+- Log_{10} and Log_e functions;
+- Recip;
+- Kings Law data;
+- Gaussian; and
+- 4th order Polynomial
-- pst-plot
- o new syntax for \psplot and \psparametricplot
- o new macro psTangentLine
- o new macro psplotTangent
- o new macro psplotDiffEqn
-- pst-node
- o new option lineAngle for ncdiag
- o new macros for interpolation nodes
- and linear combination of two vectors
- o new macro ncbarr (line with 5 segments)
-
-
-pstricks-add.pro : the prolog file for pstricks-add
-pstricks-add-doc.tex: the included doc file
-
-Save the files pstricks-add.sty|pro|tex in a directory,
-which is part of your local TeX tree. The pro file should go
-into $TEXMF/dvips/pstricks/
-Then do not forget to run texhash to update this tree.
-For more information see the documentation of your LATEX distribution
-on installing packages into your local TeX system or read the
-TeX Frequently Asked Questions:
-(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
diff --git a/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.bib b/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.bib
index 67a3311e6a4..6d8fee6e25a 100644
--- a/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.bib
@@ -17,10 +17,10 @@
@Book{PSTricks2,
author = {Herbert Vo\ss},
title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {6.},
- publisher = {DANTE -- Lehmanns},
- year = {2010},
- address = {Heidelberg/Berlin}
+ edition = {7},
+ publisher = {DANTE and Lehmanns Media},
+ year = {2017},
+ location = {Heidelberg and Berlin}
}
@Book{PSTricks-E,
@@ -35,7 +35,7 @@
@Book{companion04,
author = {Frank Mittelbach and Michel Goosens et al},
title = {The {\LaTeX} {C}ompanion},
- edition = {second},
+ edition = {2},
publisher = {Addison-Wesley Publishing Company},
year = {2004},
address = {Boston}
@@ -95,7 +95,7 @@
author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
title = {The {\LaTeX} {G}raphics {C}ompanion},
publisher = {{Addison-Wesley Publishing Company}},
- edition = second,
+ edition = 2,
year = {2007},
address = {Reading, Mass.}
}
@@ -129,37 +129,4 @@
year = 1989,
}
-@Manual{pstricks,
- Title = {PSTricks - {\PS} macros for generic {\TeX}},
- Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{http://www.tug.org/application/PSTricks}},
- Note = {},
- year = 1993
-}
-
-@Manual{pst-plot,
- Title = {\texttt{pst-plot}: Plotting two dimensional functions and data},
- Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
- Note = {},
- year = 1999
-}
-
-@Manual{multido,
- Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
- Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
- Note = {},
- year = 1997
-}
-
-@MISC{xkeyval,
- author = {Hendri Adriaens},
- title = {xkeyval package},
- howpublished = {\url{CTAN:/macros/latex/contrib/xkeyval}},
- year = 2004
-}
diff --git a/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.pdf b/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.pdf
index 5f8f02117bf..9d1c6fed0b9 100644
--- a/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.tex b/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.tex
index b00c1c98ba4..a61092a5247 100644
--- a/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.tex
@@ -5,6 +5,9 @@
\usepackage{pst-fit}
\let\pstFitFV\fileversion
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+
\input{pst-fit-doc.data}
\readdata[ignoreLines=0]{\Gauss}{gauss.dat}
\readdata[ignoreLines=0]{\Power}{power.dat}
@@ -31,7 +34,8 @@
\title{\texttt{pst-fit}}
\subtitle{Curve fitting; v.\pstFitFV}
-\author{Buddy Ledger}
+\author{Buddy Ledger\\
+Herbert Voß}
\docauthor{}
\date{\today}
\maketitle
@@ -170,8 +174,7 @@
\bgroup
\raggedright
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-fit-doc}
+\printbibliography
\egroup
\printindex
diff --git a/Master/texmf-dist/source/generic/pst-fit/Makefile b/Master/texmf-dist/source/generic/pst-fit/Makefile
deleted file mode 100644
index 0d272b0d730..00000000000
--- a/Master/texmf-dist/source/generic/pst-fit/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# `Makefile' for `pst-fit.pdf', hv, 2006/08/11
-
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-
-PACKAGE = pst-fit
-
-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)
- $(RM) *.dat
-
-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 $(MAIN).data $(TDS)/source/$(PACKAGE)/
- cp -u Makefile $(TDS)/source/$(PACKAGE)/
-
-# EOF
diff --git a/Master/texmf-dist/tex/generic/pst-fit/pst-fit.tex b/Master/texmf-dist/tex/generic/pst-fit/pst-fit.tex
index 2336d5c20b3..3f174660acb 100644
--- a/Master/texmf-dist/tex/generic/pst-fit/pst-fit.tex
+++ b/Master/texmf-dist/tex/generic/pst-fit/pst-fit.tex
@@ -23,13 +23,17 @@
\ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{0.01}
-\def\filedate{2012/04/01}
+\def\fileversion{0.02}
+\def\filedate{2017/08/24}
\message{`PST-fit' v\fileversion, \filedate\space (BL,HV)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
-
+%
\pst@addfams{pst-fit}
+%
+\define@key[psset]{pst-fit}{symbolFont}{\def\psk@symbolFont{/#1 }}%
+\psset[pst-fit]{symbolFont=StandardSymL}
+%
\def\beginplot@ErrorLine{\begin@OpenObj}
\def\endplot@ErrorLine{\psErrorLine@ii}
\def\psErrorLine@ii{%
@@ -236,8 +240,8 @@ n 0 eq not
\def\psPrintCoor@iii{%
/mfont { \psk@PSfont\space findfont \psk@fontscale\space scalefont setfont } bind def
- /mfontexp { \psk@PSfont findfont \psk@fontscale 1.2 div scalefont setfont } bind def
- /s1 { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def
+ /mfontexp { \psk@PSfont\space findfont \psk@fontscale 1.2 div scalefont setfont } bind def
+ /s1 { \psk@symbolFont\space findfont \psk@fontscale\space scalefont setfont } bind def
/ttxspc \psk@fontscale\space 4 div def
/txspc ttxspc 4 div def
%pop
@@ -503,7 +507,7 @@ n 0 eq not
/praXmax -999999 def
/praYmin 999999 def
/prafont {\psk@PSfont\space findfont tempfontscale scalefont setfont} bind def
- /prasym { /Symbol findfont tempfontscale 2 mul scalefont setfont} bind def
+ /prasym { \psk@symbolFont\space findfont tempfontscale 2 mul scalefont setfont} bind def
prafont
praTemp 2 get \pst@number\psxunit\space mul praTemp 3 get \pst@number\psyunit\space mul moveto
praARY length praTemp 1 get praTemp 0 get mul eq not { (Row x Col > Vector Dim) show }{%
diff --git a/Master/texmf-dist/tex/latex/pst-fit/pst-fit.sty b/Master/texmf-dist/tex/latex/pst-fit/pst-fit.sty
index 20a84e819a0..89ab3527fb3 100644
--- a/Master/texmf-dist/tex/latex/pst-fit/pst-fit.sty
+++ b/Master/texmf-dist/tex/latex/pst-fit/pst-fit.sty
@@ -4,10 +4,6 @@
\ProvidesPackage{pst-fit}[2012/04/01 package wrapper for
pst-fit.tex (hv)]
\input{pst-fit.tex}
-%\IfFileExists{pst-fit.pro}{%
-% \ProvidesFile{pst-fit.pro}
-% [2012/04/01 v. 0.01, PostScript prologue file (hv)]
-% \@addtofilelist{pst-fit.pro}}{}%
\ProvidesFile{pst-fit.tex}
[\filedate\space v\fileversion\space `PST-fit' (hv)]
\endinput