summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-17 21:30:22 +0000
committerKarl Berry <karl@freefriends.org>2018-12-17 21:30:22 +0000
commit0eca414d24b2ef276840906d8b58eafb63bd573f (patch)
treeed75fb796fb02dd5bb81884c264f308e66e95443 /Master
parent2da78c11b17af25d227b62281ed063978feefdf4 (diff)
pstricks (17dec18)
git-svn-id: svn://tug.org/texlive/trunk@49437 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news12.tex4
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news18.pdfbin64586 -> 68761 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news18.tex16
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro6
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex37
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-doc.cls32
6 files changed, 48 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
index dc9aeca3c00..759869d864b 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news12.tex 165 2015-07-26 07:27:55Z herbert $
+%% $Id: pst-news12.tex 847 2018-12-04 08:04:28Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -124,7 +124,7 @@ width if the \Lkeyword{symbolStep} is set by a negative number without a unit.
\subsection{Fill style \texttt{eohlines} and \texttt{eovlines}}
-These fill stykes uses the PS function \Lps{eoclip} instead of \Lps{clip}.
+These fill styles uses the PS function \Lps{eoclip} instead of \Lps{clip}.
\begin{LTXexample}[pos=t]
\begin{pspicture}[showgrid](6,6)
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
index 749a3eb4d0e..bcdd9dcea26 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
index e8f8c80a139..d80e380af20 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
@@ -51,7 +51,7 @@ this new file.
%--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.tex} (v. 2.87 -- 2018/12/11)}
+\section{\texttt{pstricks.tex} (v. 2.89 -- 2018/12/16)}
%--------------------------------------------------------------------------------------
Use the \Lcs{long} definition for \Lcs{@fornoop} to be compatible to the latest
@@ -60,10 +60,18 @@ changes in \LaTeX.
In old versions the macro \Lcs{rput} can't be used with the key-value setting. The latest version
of \Lfile{pstricks.tex} defines a modified \Lcs{rput} which ckecks first if a following
optional argument has the old behaviour, eg \Lcs{rput}\texttt{[lb]\{...\}} or
-a key/value setting like \Lcs{rput}\texttt{[ref=lb,rot=...,](...)}. However, there should be no
+a key/value setting like \Lcs{rput}\texttt{[ref=lb,rot=...](...)}. However, there should be no
change in the output and, of course, it makes no sense to mix the old and new setting in \emph{one}
-\Lcs{rput} macro.
-
+\Lcs{rput} macro. The setting refers only to the optional arguments which are valid for \Lcs{rput}:
+
+\begin{LTXexample}[width=6cm]
+\begin{pspicture}[showgrid](6,5)
+\rput[ref=rt](3,2){%
+ \psframe[linecolor=red](3,3)}
+\rput[lb](0,0){\psframe(3,3)}
+\rput{45}(3,0.5){\psframe(3,3)}
+\end{pspicture}
+\end{LTXexample}
\subsection{PostScript Fonts}
This version of PSTricks uses the Ghostscript fonts from URW instead of the
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index ea9e66cc361..0cdc0b29f1f 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,7 +1,7 @@
% $Id: pstricks.pro 838 2018-11-14 19:00:45Z herbert $
%
%% PostScript prologue for pstricks.tex.
-%% Version 1.29, 2018/11/14
+%% Version 1.30, 2018/12/17
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -1015,7 +1015,7 @@ gsave
/f y1 dy mul n 0 gt { dy n div 2 div h mul sub } if def
/g y2 dy mul n 0 gt { dy n div 2 div h mul add } if def
x2 x1 sub w mul 1 add dup 1000 gt { pop 1000 } if
- { i dx mul dup y0 moveto
+ { i dx mul dup xGridOffset add y0 moveto
b 0 gt
{ gsave c i a cvs dup stringwidth pop
/z2 ED w 0 gt {z1} {z1 z2 add neg} ifelse
@@ -1037,7 +1037,7 @@ gsave
/f x1 dx mul n 0 gt { dx n div 2 div w mul sub } if def
/g x2 dx mul n 0 gt { dx n div 2 div w mul add } if def
y2 y1 sub h mul 1 add dup 1000 gt { pop 1000 } if
- { newpath i dy mul dup x0 exch moveto
+ { newpath i dy mul dup yGridOffset add x0 exch moveto
b 0 gt { gsave c i a cvs dup stringwidth pop
/z2 ED
w 0 gt {z1 z2 add neg} {z1} ifelse
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 923352d4402..3934d1b1111 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks.tex 857 2018-12-13 11:20:40Z herbert $
+%% $Id: pstricks.tex 869 2018-12-16 12:19:43Z herbert $
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
@@ -22,7 +22,7 @@
%% !! loading additional TeX packages see line 38,39 and 72ff
%% !! loading config file pstricks.con line 439
%% !! loading pro files line 452ff
-%% !! fileversion and date see line 78
+%% !! fileversion and date see line 83
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
\edef\PstAtCode{\the\catcode`\@}
@@ -80,8 +80,8 @@
\fi
\let\pgfforeach\foreach
%
-\def\fileversion{2.88}
-\def\filedate{2018/12/13}
+\def\fileversion{2.90}
+\def\filedate{2018/12/17}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -650,15 +650,15 @@
\newrgbcolor{magenta}{1 0 1}
\@ifundefined{xglobal}% do we have xcolor loaded?
- {\@newcolor{randomgray}{Rand setgray}%
- \@newcolor{randomrgb}{Rand Rand Rand setrgbcolor}%
- \@newcolor{randomcmyk}{Rand Rand Rand Rand setcmykcolor}%
- \@newcolor{randomhsb}{Rand Rand Rand sethsbcolor}%
+ {\@newcolor{randomgray}{tx@Dict begin Rand setgray end}%
+ \@newcolor{randomrgb}{tx@Dict begin Rand Rand Rand setrgbcolor end}%
+ \@newcolor{randomcmyk}{tx@Dict begin Rand Rand Rand Rand setcmykcolor end}%
+ \@newcolor{randomhsb}{tx@Dict begin Rand Rand Rand sethsbcolor end}%
}{%
- \definecolor[ps]{randomgray}{gray}{Rand}%
- \definecolor[ps]{randomrgb}{rgb}{Rand Rand Rand}%
- \definecolor[ps]{randomcmyk}{cmyk}{Rand Rand Rand Rand}%
- \definecolor[ps]{randomhsb}{hsb}{Rand Rand Rand}%
+ \definecolor[ps]{randomgray}{gray}{tx@Dict begin Rand end}%
+ \definecolor[ps]{randomrgb}{rgb}{tx@Dict begin Rand Rand Rand end}%
+ \definecolor[ps]{randomcmyk}{cmyk}{tx@Dict begin Rand Rand Rand Rand end}%
+ \definecolor[ps]{randomhsb}{hsb}{tx@Dict begin Rand Rand Rand end}%
}
%
\define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{}
@@ -2826,6 +2826,9 @@
\psset[pstricks]{gridlabels=10pt}
\define@key[psset]{pstricks}{gridlabelcolor}[black]{\pst@getcolor{#1}\psgridlabelcolor}
\psset[pstricks]{gridlabelcolor=black}
+\define@key[psset]{pstricks}{xgridoffset}[0]{\pst@getlength{#1}\psk@xgridoffset}
+\define@key[psset]{pstricks}{ygridoffset}[0]{\pst@getlength{#1}\psk@ygridoffset}
+\psset[pstricks]{xgridoffset=0,ygridoffset=0}
\def\tx@Grid{Grid }
@@ -2840,6 +2843,8 @@
\pst@@getcoor{#3}%
\ifnum\psk@subgriddiv>1\relax
\addto@pscode{
+ /xGridOffset \psk@xgridoffset\space def
+ /yGridOffset \psk@ygridoffset\space def
gsave
\tx@setStrokeTransparency
\psk@subgridwidth SLW
@@ -2856,6 +2861,8 @@
\fi%
\addto@pscode{
gsave
+ /xGridOffset \psk@xgridoffset def
+ /yGridOffset \psk@ygridoffset def
\tx@setStrokeTransparency
\psk@gridwidth SLW
\pst@usecolor\psgridcolor
@@ -4101,14 +4108,13 @@ pop
\def\tx@PutCoor{PutCoor }
\def\tx@PutBegin{PutBegin }
\def\tx@PutEnd{PutEnd }
-\def\rput{\pst@ifstar{\@ifnextchar[{\rput@i}{\begingroup\rput@ii}}}
+\def\rput{\def\pst@par{}\pst@ifstar{\@ifnextchar[{\rput@i}{\rput@ii}}}
\def\rput@i[#1]{%
- \begingroup
\test@for@options#1=\@nil
\ifnum\the\pst@cntm=\z@
\addto@par{ref={#1}}%
\else
- \expandafter\psset\expandafter{#1}%
+ \expandafter\addto@par\expandafter{#1}%
\fi
\rput@ii
}
@@ -4124,6 +4130,7 @@ pop
\def\rput@iii#1{\addto@par{rot={#1}}\@ifnextchar({\rput@iv}{\rput@iv(\z@,\z@)}}
\def\rput@iv(#1){\pst@killglue\pst@makebox{\rput@v{#1}}}
\def\rput@v#1{%
+ \begingroup
\use@par
\if@star\pst@starbox\fi
\pst@makesmall\pst@hbox
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index e90cbdd5c01..d03ad411d9c 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
@@ -1,4 +1,4 @@
-% $Id: pst-doc.cls 755 2018-04-13 11:33:43Z herbert $
+% $Id: pst-doc.cls 857 2018-12-13 11:20:40Z herbert $
%
%%
%% The PSTricks Project
@@ -16,7 +16,7 @@
%
\listfiles
\ProvidesClass{pst-doc}[2017/04/18 v 0.20 PSTricks documentation class (hv)]
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption,usegeometry}{scrartcl}}
\ProcessOptions\relax
%
\LoadClass{scrartcl}
@@ -35,7 +35,6 @@
%\RequirePackage[euler-digits]{eulervm}
\RequirePackage{bera}
%\RequirePackage[scaled=0.85]{luximono}
- \RequirePackage[utf8]{inputenc}
\fi
\usepackage[includeheadfoot,lmargin=2cm,tmargin=1cm,bmargin=1.5cm,rmargin=1.5cm]{geometry}
\RequirePackage{ifpdf}
@@ -251,23 +250,6 @@ xleftmargin=0pt,xrightmargin=0pt,
\setcounter{secnumdepth}{2} % Abbildungsnummerierung mit groesserer Tiefe
\setcounter{tocdepth}{2} % Inhaltsverzeichnis mit groesserer Tiefe
%
-\renewcommand*\l@section[2]{%
- \ifnum \c@tocdepth >\z@
- \addpenalty\@secpenalty
- \addvspace{1.0em \@plus\p@}%
- \setlength\@tempdima{2em}%
- \begingroup
- \parindent \z@ \rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \leavevmode \bfseries
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
- \endgroup
- \fi}
-\renewcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{3.6em}}
-\renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4.5em}}
-%
% Inhalte von List of Figures
\IfPackageLoaded{subfig}{\setcounter{lofdepth}{1} %1 = nur figures, 2 = figures + subfigures
}
@@ -413,9 +395,9 @@ xleftmargin=0pt,xrightmargin=0pt,
\setlength\BDefbelowskip{10pt}
\setlength\BDefinlineskip{6pt}
%
-\newsavebox{\boxdef}
+\newsavebox\boxdef
\newenvironment{BDef}
- {\begin{lrbox}\boxdef
+ {\begin{lrbox}{\boxdef}
\def\arraystretch{1.0}
\begin{tabular}{@{}l@{}l@{}l@{}}}
{\end{tabular}\end{lrbox}
@@ -468,6 +450,7 @@ xleftmargin=0pt,xrightmargin=0pt,
\providecommand\bgTitle{}
\providecommand\LenToUnit[1]{#1\@gobble}
+\iffalse
\renewcommand\maketitle{%
\thispagestyle{empty}%
\begin{titlepage}
@@ -503,7 +486,9 @@ xleftmargin=0pt,xrightmargin=0pt,
\rput[lb](3,-2.6){\parbox[b]{19cm}{\sffamily\RaggedRight
\ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\
\ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{%
- \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}}}
+ \bfseries\shortstack[l]{\@author}
+ %\begin{tabular}[t]{@{}l@{}} \@author\end{tabular}%
+}}}
\rput[C](11,4){\bgImage}%
\end{pspicture}%
\fi
@@ -522,6 +507,7 @@ xleftmargin=0pt,xrightmargin=0pt,
\global\let\date\relax%
\global\let\and\relax%
}
+\fi
\newdimen\fullWidth
\fullWidth=\linewidth