pstricks (17sep16)

git-svn-id: svn://tug.org/texlive/trunk@42090 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 15 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 63f12e9e309..a8e729e96aa 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,7 +1,7 @@
 %% pstricks.tex
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
 %% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2016 Herbert Voss
+%% Copyright 2004-2017 Herbert Voss
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -126,19 +126,19 @@
   \fi
   \XKV@tempa
 }
-
+%
 \def\ProvidesPackageRCS{\@ifnextchar[\ProvidesPackageRCS@i{\ProvidesPackageRCS@i[] }}  %$
 \def\ProvidesPackageRCS@i[#1] $#2${} %$
 \catcode`\@=\PstAtCode\relax
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex\fi
-
+%
 \input pgfutil-common.tex
 \input pgfkeys.code.tex
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.68}
-\def\filedate{2016/06/09}
+\def\fileversion{2.69}
+\def\filedate{2016/09/16}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -154,7 +154,7 @@
 \long\def\@forloop#1,#2,#3\@@#4#5{\def#4{#1}\ifx#4\@nnil \else
        #5\def#4{#2}\ifx#4\@nnil \else\global\advance\psLoopIndex by \@ne\relax
        #5\@iforloop #3\@@#4{#5}\fi\fi}
-
+%
 \long\def\@iforloop#1,#2\@@#3#4{\global\advance\psLoopIndex by \@ne\relax%
    \def#3{#1}\ifx #3\@nnil
      \expandafter\@fornoop \else
@@ -701,8 +701,9 @@
 \newrgbcolor{cyan}{0 1 1}
 \newrgbcolor{magenta}{1 0 1}
 %
+\define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{}
 \define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture
-\psset[pstricks]{bgcolor={}}% \pst@bgcolor is \@empty
+\psset[pstricks]{bgcolor={},draft=false}% \pst@bgcolor is \@empty
 
 \define@key[psset]{pstricks}{style}{%
   \@ifundefined{pscs@#1}%
@@ -4446,15 +4447,15 @@ pop
     \kern\pst@dimc}%
   \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi
   \leavevmode
-  \ifdim\overfullrule=\z@
-    \box\pst@hbox
-  \else
+  \ifPst@draft
     \expandafter\ifx\csname @latexerr\endcsname\relax
       \box\pst@hbox
     \else  %	do we have LaTeX? 
       \fboxsep=0pt
       \fbox{\rule[-\pst@shift]{0pt}{\ht\pst@hbox}\rule{\wd\pst@hbox}{0pt}}%
     \fi
+  \else
+    \box\pst@hbox
   \fi
   \endgroup
   \psset[pstricks]{shift=0}% reset value
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index 7521a82a09f..85015b16e53 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
@@ -19,8 +19,7 @@
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
 \ProcessOptions\relax
 %
-\LoadClass[%titlepage,
-DIV13]{scrartcl}
+\LoadClass{scrartcl}
 %
 \RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor}
 \RequirePackage{ifxetex}
@@ -36,6 +35,7 @@ DIV13]{scrartcl}
   \RequirePackage{bera}
   %\RequirePackage[scaled=0.85]{luximono}
 \fi
+\usepackage[includeheadfoot,lmargin=2cm,tmargin=1cm,bmargin=1.5cm,rmargin=1.5cm]{geometry}
 \RequirePackage{ifpdf}
 % Define commands that don't eat spaces.
 \RequirePackage{xspace}
@@ -327,6 +327,8 @@ xleftmargin=0pt,xrightmargin=0pt,
 \let\nxLkeyval\nxLkeyword
 \let\nxLenv\nxLkeyword
 \let\nxLps\nxLkeyword
+\def\LColor#1{\texttt{#1}\xLColor{#1}}
+\def\xLColor#1{\index{#1@\texttt{#1}}\index{Color!#1@\texttt{#1}}}
 \def\Lkeyval#1{\texttt{#1}\xLkeyval{#1}}
 \def\xLkeyval#1{\index{#1@\texttt{#1}}\index{Keyvalue!#1@\texttt{#1}}}
 \def\xLoption#1{\index{#1@\texttt{#1}}\index{Package option!#1@\texttt{#1}}}