summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news16.pdfbin38954 -> 47967 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news16.tex9
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news19.pdfbin59882 -> 63160 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news19.tex5
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def3
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex139
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty7
7 files changed, 123 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
index 59eb0df588d..8841715ed5d 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex
index c55be6459c6..9a544ca5bd4 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex
@@ -18,10 +18,13 @@
\def\textat{\char064}
\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
escapechar=?}
+
+\addbibresource{PSTricks.bib}
+
\begin{document}
%\psset{PstDebug=1}
-\title{\texttt{News -- \the\year}\\ \Large new macros and bugfixes for the
+\title{\texttt{News -- 2016}\\ \Large new macros and bugfixes for the
basic package \nxLFile{pstricks}}
\author{Herbert Voß}
\date{\today}
@@ -91,8 +94,8 @@ For example
\clearpage
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{PSTricks}
+%\bibliographystyle{plain}
+\printbibliography
\printindex
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf
index c7999305a0c..03e52eaaa59 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex
index 9db696bc293..5c7a52d60a6 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news19.tex 934 2019-02-23 14:07:34Z herbert $
+%% $Id: pst-news19.tex 927 2019-01-30 15:11:30Z herbert $
\PassOptionsToPackage{useCalc}{pstricks}
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,twoside]{pst-doc}
@@ -102,7 +102,6 @@ pairwise coordinates.
\end{LTXexample}
-\iffalse
There is a new experimental feature, which allows algebraic notation for
coordinates. It needs
@@ -117,7 +116,7 @@ coordinates. It needs
\end{pspicture}
\end{LTXexample}
-\fi
+
\subsection{Error message}
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
index 3799b1675b4..d5e7311030d 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
@@ -1,4 +1,4 @@
-%% $Id: pstricks-tex.def 909 2019-01-14 16:06:51Z herbert $
+%% $Id: pstricks-tex.def 1044 2019-04-11 09:32:09Z herbert $
%% pstricks-tex.def
%% Copyright 2017- Herbert Voss
%
@@ -44,6 +44,7 @@
\fi
%
\newif\ifpst@psfonts \pst@psfontsfalse % defined in pstricks.sty
+ \newif\ifpst@useCalc \pst@useCalcfalse % defined in pstricks.sty
%
\long\def\@ifundefined#1#2#3{\expandafter\ifx\csname #1\endcsname\relax#2\else#3\fi}
\def\@namedef#1{\expandafter\def\csname #1\endcsname}
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index f2ee33fda9d..70283822fcc 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,4 +1,3 @@
-%% $Id: pstricks.tex 934 2019-02-23 14:07:34Z herbert $
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt
%% COPYRIGHT 2000-2003 by Denis Girou.
@@ -81,8 +80,8 @@
\fi
\let\pgfforeach\foreach
%
-\def\fileversion{2.96}
-\def\filedate{2019/02/23}
+\def\fileversion{2.97}
+\def\filedate{2019/05/11}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -718,13 +717,25 @@
}
\def\pssetxlength#1#2{%
\let\@psunit\psxunit
- \afterassignment\pstunit@off
- #1 #2\@psunit%
+ \ifpst@useCalc
+ \edef\@@temp{\pscalculate{#2}}%
+ \afterassignment\pstunit@off
+ #1 \@@temp\@psunit
+ \else
+ \afterassignment\pstunit@off
+ #1 #2\@psunit
+ \fi
}
\def\pssetylength#1#2{%
\let\@psunit\psyunit
- \afterassignment\pstunit@off
- #1 #2\@psunit%
+ \ifpst@useCalc
+ \edef\@@temp{\pscalculate{#2}}%
+ \afterassignment\pstunit@off
+ #1 \@@temp\@psunit
+ \else
+ \afterassignment\pstunit@off
+ #1 #2\@psunit
+ \fi
}
\define@key[psset]{pstricks}{unit}[1cm]{%
\pssetlength\psunit{#1}%
@@ -754,7 +765,7 @@
\def\pst@getcoors#1#2{%
\def\pst@aftercoors{\addto@pscode{#1 \pst@coors }#2}%
\def\pst@coors{}%
- \pst@@getcoors%
+ \pst@@getcoors
}
\def\pst@@getcoors(#1){%
\pst@@getcoor{#1}%
@@ -804,13 +815,13 @@
\def\SpecialCoor{%
\def\pst@@getcoor##1{%
\begingroup%
- \pst@activecoor%
+ \pst@activecoor
\xdef\pst@tempg{##1}%
- \endgroup%
+ \endgroup
\expandafter\special@coor\pst@tempg||\@nil}%
\def\pstCheckCoorType##1{%
- \begingroup%
- \pst@activecoor%
+ \begingroup
+ \pst@activecoor
\xdef\pst@tempg{##1}%
\endgroup
\psDEBUG[pstCheckCoorType]{:Checking coor \pst@tempg:}%
@@ -1055,7 +1066,7 @@
\def\Cartesian@(#1,#2){%
\pssetxlength\psxunit{#1}%
\pssetylength\psyunit{#2}%
- \ignorespaces%
+ \ignorespaces
}
\def\Polar{%
\def\psput@cartesian{\psput@special}%
@@ -1714,12 +1725,12 @@
% ------------------------- hv 1.10 end ------------------------
%
\def\begin@ClosedObj{%
- \leavevmode%
- \pst@killglue%
- \begingroup%
- \use@par%
- \solid@star%
- \ifpsdoubleline\pst@setdoublesep\fi%
+ \leavevmode
+ \pst@killglue
+ \begingroup
+ \use@par
+ \solid@star
+ \ifpsdoubleline\pst@setdoublesep\fi
\pst@addarrowdef% DG addition
\init@pscode}
%
@@ -1985,6 +1996,7 @@
\pst@stroke
\end@SpecialObj
\let\pst@ifcustom\iffalse
+ \ignorespaces
}
%
\let\pst@ifcustom\iffalse
@@ -2487,7 +2499,7 @@
\def\psline@i{%
\pst@getarrows{%
\begin@OpenObj
- \pst@getcoors[\psline@ii%
+ \pst@getcoors[\psline@ii
}%
}
\def\psline@ii{%
@@ -2519,8 +2531,8 @@
\psLine@ii}}
\def\psLine@ii(#1){\@ifnextchar({\psLine@iii(#1)}{\psLine@iii(0,0)(#1)}}%
\def\psLine@iii(#1)(#2){%
- \pst@getcoor{#1}\pst@tempA%
- \pst@getcoor{#2}\pst@tempB%
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
\addto@pscode{
\ifPst@noCurrentPoint\else\pst@cp\fi % current point?
[ % start for coordinate array
@@ -2543,8 +2555,8 @@
\init@pscode
\let\pst@linetype\pst@arrowtype
\pst@addarrowdef
- \pst@getcoor{#1}\pst@tempA%
- \pst@getcoor{#2}\pst@tempB%
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
\addto@pscode{
\ifPst@noCurrentPoint\else\pst@cp\fi % current point?
[ % start for coordinate array
@@ -2996,12 +3008,12 @@
\psset[pstricks]{boxsep}
%
\def\pst@useboxpar{%
- \use@par%
- \if@star%
- \let\pslinecolor\psfillcolor%
- \solid@star%
+ \use@par
+ \if@star
+ \let\pslinecolor\psfillcolor
+ \solid@star
\let\solid@star\relax
- \fi%
+ \fi
\ifpsdoubleline \pst@setdoublesep \fi}
%
\def\psframebox{\def\pst@par{}\pst@object{psframebox}}
@@ -3461,6 +3473,67 @@ pop
\end@OpenObj
\fi
}
+%
+\def\psarcOA{\pst@object{psarcOA}}% \psarcOA[..](O)(A){angle1}{angle2}
+\def\psarcOA@i{\@ifnextchar({\psarcOA@iii}{\psarcOA@ii}}
+\def\psarcOA@ii#1{\addto@par{arrows=#1}\@ifnextchar(\psarcOA@iii{\psarcOA@iii(0,0)}}
+\def\psarcOA@iii(#1)(#2)#3#4{%
+ \pst@getangle{#3}\pst@tempa
+ \pst@getangle{#4}\pst@tempb
+ \ifx\pst@tempa\pst@tempb
+ \else
+ \begin@OpenObj
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
+ \addto@pscode{
+ \pst@tempA 2 copy /y ED /x ED \pst@tempB Pyth2 /r ED
+ x y translate
+ /c 57.2957 r \tx@Div def
+ /angleA
+ \pst@tempa
+ \psk@arcsepA c mul 2 div
+ \ifcase\psarc@type add \or sub \fi def
+ /angleB
+ \pst@tempb
+ \psk@arcsepB c mul 2 div
+ \ifcase\psarc@type sub \or add \fi def
+ \ifshowpoints\psarc@showpoints\fi
+ \ifx\psk@arrowA\@empty
+ \ifnum\psk@liftpen=2
+ r angleA \tx@PtoC moveto
+ \fi
+ \fi
+ /angleAtoB angleB angleA gt { true }{ false } ifelse def
+ 0 0 r
+ angleA
+ \ifx\psk@arrowA\@empty\else
+ { ArrowA CP }
+ r 0 gt \pslbrace
+ { \ifcase\psarc@type add \or sub \fi } \psrbrace\pslbrace
+ { \ifcase\psarc@type sub \or add \fi } \psrbrace ifelse
+% { \ifcase\psarc@type add \or sub \fi }
+ \tx@ArcArrow
+% dup AngleA gt AngleAtoB exor { neg } fi
+ \fi
+ angleB
+ \ifx\psk@arrowB\@empty\else
+ { ArrowB }
+ r 0 gt \pslbrace
+ { \ifcase\psarc@type sub \or add \fi } \psrbrace\pslbrace
+ { \ifcase\psarc@type add \or sub \fi } \psrbrace ifelse
+% { \ifcase\psarc@type sub \or add \fi }
+ \tx@ArcArrow
+ dup angleA gt angleAtoB xor { pop angleA } if
+ \fi
+ \ifcase\psarc@type arc \or arcn \fi
+ \ifPst@variableLW \pst@flattenpath \fi
+ x neg y neg translate
+ }%
+ \gdef\psarc@type{0}%
+ \showpointsfalse
+ \end@OpenObj
+ \fi
+}
\def\psarc@iv{%
\pst@coor /y ED /x ED
/r \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dima \fi def
@@ -3506,7 +3579,8 @@ pop
\tx@ArcArrow
dup angleA gt angleAtoB xor { pop angleA } if
\fi
-\ifcase\psarc@type arc \or arcn \fi}
+ \ifcase\psarc@type arc \or arcn \fi
+}
% hv ----- 1.10 2005-05-05 ------------------------> end
%
\def\psarc@type{0}
@@ -3528,7 +3602,8 @@ pop
\addbefore@par{psscale=1}% be sure, that it is defined
\pst@getarrows{%
\begin@OpenObj%
- \pst@getcoors{}\psarcAB@ii%
+ \pst@getcoors{}%
+ \psarcAB@ii
}%
}
\def\psarcAB@ii{%
@@ -3552,7 +3627,7 @@ pop
y add exch x add exch moveto
\fi
\fi
- \psarc@v }%
+ \psarc@v}%
\gdef\psarc@type{0}%
\showpointsfalse%
\end@OpenObj%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 36014b1d9b7..dff12d797f4 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -1,4 +1,4 @@
-% $Id: pstricks.sty 872 2018-12-21 20:39:31Z herbert $
+% $Id: pstricks.sty 1044 2019-04-11 09:32:09Z herbert $
%%
%% This is file `pstricks.sty'.
%%
@@ -37,10 +37,12 @@
\def\pst@ColorPackage{xcolor}
\DeclareOption{noxcolor}{\def\pst@ColorPackage{color}}
%
+\newif\ifpst@useCalc \pst@useCalcfalse
\newif\ifpst@psfonts \pst@psfontsfalse
\newif\if@check@engine \@check@enginetrue
\newif\ifpst@xetex \pst@xetexfalse
+\DeclareOption{useCalc}{\pst@useCalctrue}
\DeclareOption{psfonts}{\pst@psfontstrue}
\DeclareOption{noEngineCheck}{\@check@enginefalse}
\DeclareOption{xetex}{\global\pst@xetextrue}
@@ -80,6 +82,9 @@
\RequirePackage{iftex}
\RequirePackage{shellesc}
+\ifpst@useCalc
+ \RequirePackage{pst-calculate}
+\fi
%\ifPDFTeX
% \ifpdfshellescape\else
% \@latex@error
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 02:56:52 +0000