texlive[51102] Master/texmf-dist: pstricks (12may19)
commits+karl at tug.org
commits+karl at tug.org
Sun May 12 22:17:14 CEST 2019
Revision: 51102
http://tug.org/svn/texlive?view=revision&revision=51102
Author: karl
Date: 2019-05-12 22:17:14 +0200 (Sun, 12 May 2019)
Log Message:
-----------
pstricks (12may19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
trunk/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex
trunk/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf
trunk/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex
trunk/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex 2019-05-12 20:16:41 UTC (rev 51101)
+++ trunk/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex 2019-05-12 20:17:14 UTC (rev 51102)
@@ -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 @@
\clearpage
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{PSTricks}
+%\bibliographystyle{plain}
+\printbibliography
\printindex
Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex 2019-05-12 20:16:41 UTC (rev 51101)
+++ trunk/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex 2019-05-12 20:17:14 UTC (rev 51102)
@@ -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 @@
\end{LTXexample}
-\iffalse
There is a new experimental feature, which allows algebraic notation for
coordinates. It needs
@@ -117,9 +116,9 @@
\end{pspicture}
\end{LTXexample}
-\fi
+
\subsection{Error message}
Using PSTricks with \Lprog{pdflatex} will work only when using package
Modified: trunk/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def 2019-05-12 20:16:41 UTC (rev 51101)
+++ trunk/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def 2019-05-12 20:17:14 UTC (rev 51102)
@@ -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 at psfonts \pst at psfontsfalse % defined in pstricks.sty
+ \newif\ifpst at useCalc \pst at 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}
Modified: trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex 2019-05-12 20:16:41 UTC (rev 51101)
+++ trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex 2019-05-12 20:17:14 UTC (rev 51102)
@@ -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 at addfams{pstricks}
%
%\define at boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -718,13 +717,25 @@
}
\def\pssetxlength#1#2{%
\let\@psunit\psxunit
- \afterassignment\pstunit at off
- #1 #2\@psunit%
+ \ifpst at useCalc
+ \edef\@@temp{\pscalculate{#2}}%
+ \afterassignment\pstunit at off
+ #1 \@@temp\@psunit
+ \else
+ \afterassignment\pstunit at off
+ #1 #2\@psunit
+ \fi
}
\def\pssetylength#1#2{%
\let\@psunit\psyunit
- \afterassignment\pstunit at off
- #1 #2\@psunit%
+ \ifpst at useCalc
+ \edef\@@temp{\pscalculate{#2}}%
+ \afterassignment\pstunit at off
+ #1 \@@temp\@psunit
+ \else
+ \afterassignment\pstunit at off
+ #1 #2\@psunit
+ \fi
}
\define at key[psset]{pstricks}{unit}[1cm]{%
\pssetlength\psunit{#1}%
@@ -754,7 +765,7 @@
\def\pst at getcoors#1#2{%
\def\pst at aftercoors{\addto at pscode{#1 \pst at coors }#2}%
\def\pst at coors{}%
- \pst@@getcoors%
+ \pst@@getcoors
}
\def\pst@@getcoors(#1){%
\pst@@getcoor{#1}%
@@ -804,13 +815,13 @@
\def\SpecialCoor{%
\def\pst@@getcoor##1{%
\begingroup%
- \pst at activecoor%
+ \pst at activecoor
\xdef\pst at tempg{##1}%
- \endgroup%
+ \endgroup
\expandafter\special at coor\pst at tempg||\@nil}%
\def\pstCheckCoorType##1{%
- \begingroup%
- \pst at activecoor%
+ \begingroup
+ \pst at activecoor
\xdef\pst at tempg{##1}%
\endgroup
\psDEBUG[pstCheckCoorType]{:Checking coor \pst at tempg:}%
@@ -1055,7 +1066,7 @@
\def\Cartesian@(#1,#2){%
\pssetxlength\psxunit{#1}%
\pssetylength\psyunit{#2}%
- \ignorespaces%
+ \ignorespaces
}
\def\Polar{%
\def\psput at cartesian{\psput at special}%
@@ -1714,12 +1725,12 @@
% ------------------------- hv 1.10 end ------------------------
%
\def\begin at ClosedObj{%
- \leavevmode%
- \pst at killglue%
- \begingroup%
- \use at par%
- \solid at star%
- \ifpsdoubleline\pst at setdoublesep\fi%
+ \leavevmode
+ \pst at killglue
+ \begingroup
+ \use at par
+ \solid at star
+ \ifpsdoubleline\pst at setdoublesep\fi
\pst at addarrowdef% DG addition
\init at pscode}
%
@@ -1985,6 +1996,7 @@
\pst at stroke
\end at SpecialObj
\let\pst at ifcustom\iffalse
+ \ignorespaces
}
%
\let\pst at ifcustom\iffalse
@@ -2487,7 +2499,7 @@
\def\psline at i{%
\pst at getarrows{%
\begin at OpenObj
- \pst at getcoors[\psline at ii%
+ \pst at getcoors[\psline at ii
}%
}
\def\psline at ii{%
@@ -2519,8 +2531,8 @@
\psLine at ii}}
\def\psLine at ii(#1){\@ifnextchar({\psLine at iii(#1)}{\psLine at iii(0,0)(#1)}}%
\def\psLine at iii(#1)(#2){%
- \pst at getcoor{#1}\pst at tempA%
- \pst at getcoor{#2}\pst at tempB%
+ \pst at getcoor{#1}\pst at tempA
+ \pst at getcoor{#2}\pst at tempB
\addto at pscode{
\ifPst at noCurrentPoint\else\pst at cp\fi % current point?
[ % start for coordinate array
@@ -2543,8 +2555,8 @@
\init at pscode
\let\pst at linetype\pst at arrowtype
\pst at addarrowdef
- \pst at getcoor{#1}\pst at tempA%
- \pst at getcoor{#2}\pst at tempB%
+ \pst at getcoor{#1}\pst at tempA
+ \pst at getcoor{#2}\pst at tempB
\addto at pscode{
\ifPst at noCurrentPoint\else\pst at cp\fi % current point?
[ % start for coordinate array
@@ -2996,12 +3008,12 @@
\psset[pstricks]{boxsep}
%
\def\pst at useboxpar{%
- \use at par%
- \if at star%
- \let\pslinecolor\psfillcolor%
- \solid at star%
+ \use at par
+ \if at star
+ \let\pslinecolor\psfillcolor
+ \solid at star
\let\solid at star\relax
- \fi%
+ \fi
\ifpsdoubleline \pst at setdoublesep \fi}
%
\def\psframebox{\def\pst at par{}\pst at object{psframebox}}
@@ -3461,6 +3473,67 @@
\end at OpenObj
\fi
}
+%
+\def\psarcOA{\pst at object{psarcOA}}% \psarcOA[..](O)(A){angle1}{angle2}
+\def\psarcOA at i{\@ifnextchar({\psarcOA at iii}{\psarcOA at ii}}
+\def\psarcOA at ii#1{\addto at par{arrows=#1}\@ifnextchar(\psarcOA at iii{\psarcOA at iii(0,0)}}
+\def\psarcOA at iii(#1)(#2)#3#4{%
+ \pst at getangle{#3}\pst at tempa
+ \pst at getangle{#4}\pst at tempb
+ \ifx\pst at tempa\pst at tempb
+ \else
+ \begin at OpenObj
+ \pst at getcoor{#1}\pst at tempA
+ \pst at getcoor{#2}\pst at tempB
+ \addto at pscode{
+ \pst at tempA 2 copy /y ED /x ED \pst at tempB Pyth2 /r ED
+ x y translate
+ /c 57.2957 r \tx at Div def
+ /angleA
+ \pst at tempa
+ \psk at arcsepA c mul 2 div
+ \ifcase\psarc at type add \or sub \fi def
+ /angleB
+ \pst at tempb
+ \psk at arcsepB c mul 2 div
+ \ifcase\psarc at type sub \or add \fi def
+ \ifshowpoints\psarc at showpoints\fi
+ \ifx\psk at arrowA\@empty
+ \ifnum\psk at liftpen=2
+ r angleA \tx at PtoC moveto
+ \fi
+ \fi
+ /angleAtoB angleB angleA gt { true }{ false } ifelse def
+ 0 0 r
+ angleA
+ \ifx\psk at arrowA\@empty\else
+ { ArrowA CP }
+ r 0 gt \pslbrace
+ { \ifcase\psarc at type add \or sub \fi } \psrbrace\pslbrace
+ { \ifcase\psarc at type sub \or add \fi } \psrbrace ifelse
+% { \ifcase\psarc at type add \or sub \fi }
+ \tx at ArcArrow
+% dup AngleA gt AngleAtoB exor { neg } fi
+ \fi
+ angleB
+ \ifx\psk at arrowB\@empty\else
+ { ArrowB }
+ r 0 gt \pslbrace
+ { \ifcase\psarc at type sub \or add \fi } \psrbrace\pslbrace
+ { \ifcase\psarc at type add \or sub \fi } \psrbrace ifelse
+% { \ifcase\psarc at type sub \or add \fi }
+ \tx at ArcArrow
+ dup angleA gt angleAtoB xor { pop angleA } if
+ \fi
+ \ifcase\psarc at type arc \or arcn \fi
+ \ifPst at variableLW \pst at flattenpath \fi
+ x neg y neg translate
+ }%
+ \gdef\psarc at type{0}%
+ \showpointsfalse
+ \end at OpenObj
+ \fi
+}
\def\psarc at iv{%
\pst at coor /y ED /x ED
/r \ifPst at SpecialLength \pst at SpecialLength \else \pst at number\pst at dima \fi def
@@ -3506,7 +3579,8 @@
\tx at ArcArrow
dup angleA gt angleAtoB xor { pop angleA } if
\fi
-\ifcase\psarc at type arc \or arcn \fi}
+ \ifcase\psarc at type arc \or arcn \fi
+}
% hv ----- 1.10 2005-05-05 ------------------------> end
%
\def\psarc at type{0}
@@ -3528,7 +3602,8 @@
\addbefore at par{psscale=1}% be sure, that it is defined
\pst at getarrows{%
\begin at OpenObj%
- \pst at getcoors{}\psarcAB at ii%
+ \pst at getcoors{}%
+ \psarcAB at ii
}%
}
\def\psarcAB at ii{%
@@ -3552,7 +3627,7 @@
y add exch x add exch moveto
\fi
\fi
- \psarc at v }%
+ \psarc at v}%
\gdef\psarc at type{0}%
\showpointsfalse%
\end at OpenObj%
Modified: trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty 2019-05-12 20:16:41 UTC (rev 51101)
+++ trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty 2019-05-12 20:17:14 UTC (rev 51102)
@@ -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 at ColorPackage{xcolor}
\DeclareOption{noxcolor}{\def\pst at ColorPackage{color}}
%
+\newif\ifpst at useCalc \pst at useCalcfalse
\newif\ifpst at psfonts \pst at psfontsfalse
\newif\if at check@engine \@check at enginetrue
\newif\ifpst at xetex \pst at xetexfalse
+\DeclareOption{useCalc}{\pst at useCalctrue}
\DeclareOption{psfonts}{\pst at psfontstrue}
\DeclareOption{noEngineCheck}{\@check at enginefalse}
\DeclareOption{xetex}{\global\pst at xetextrue}
@@ -80,6 +82,9 @@
\RequirePackage{iftex}
\RequirePackage{shellesc}
+\ifpst at useCalc
+ \RequirePackage{pst-calculate}
+\fi
%\ifPDFTeX
% \ifpdfshellescape\else
% \@latex at error
More information about the tex-live-commits
mailing list