texlive[47572] Master/texmf-dist: pstricks (2may18)
commits+karl at tug.org
commits+karl at tug.org
Wed May 2 22:47:43 CEST 2018
Revision: 47572
http://tug.org/svn/texlive?view=revision&revision=47572
Author: karl
Date: 2018-05-02 22:47:43 +0200 (Wed, 02 May 2018)
Log Message:
-----------
pstricks (2may18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
trunk/Master/texmf-dist/doc/generic/pstricks/pst-news18.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
Added Paths:
-----------
trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
trunk/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
trunk/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex 2018-05-02 20:47:20 UTC (rev 47571)
+++ trunk/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex 2018-05-02 20:47:43 UTC (rev 47572)
@@ -51,10 +51,14 @@
%--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.tex} (v. 2.81 -- 2018/01/01)}
+\section{\texttt{pstricks.tex} (v. 2.84 -- 2018/05/01)}
%--------------------------------------------------------------------------------------
+Use the \Lcs{long} definition for \Lcs{@fornoop} to be compatible to the latest
+chanegs in \LaTeX.
+
+
\subsection{PostScript Fonts}
This version of PSTricks uses the Ghostscript fonts from URW instead of the
original base 14 fonts of PostScript. For example: instead of Helvetica we use
Added: trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro (rev 0)
+++ trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro 2018-05-02 20:47:43 UTC (rev 47572)
@@ -0,0 +1,69 @@
+% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z herbert $
+%
+%% PostScript font prologue for pstricks.tex.
+%% Version 0.01, 2016/04/22
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
+%
+%
+%true setglobal globaldict begin
+
+%dd-lmbx10 LMRoman10-Bold <dotdigits-clm.enc <lmbx10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmbxi10 LMRoman10-BoldItalic <dotdigits-clm.enc <lmbxi10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmbxo10 LMRomanSlant10-Bold <dotdigits-clm.enc <lmbxo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmcsc10 LMRomanCaps10-Regular <dotdigits-clm.enc <lmcsc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmcsco10 LMRomanCaps10-Oblique <dotdigits-clm.enc <lmcsco10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmdunh10 LMRomanDunh10-Regular <dotdigits-clm.enc <lmdunh10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmduno10 LMRomanDunh10-Oblique <dotdigits-clm.enc <lmduno10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmr10 LMRoman10-Regular <dotdigits-clm.enc <lmr10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmri10 LMRoman10-Italic <dotdigits-clm.enc <lmri10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmro10 LMRomanSlant10-Regular <dotdigits-clm.enc <lmro10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+
+/Times-Roman /LMRoman10-Regular def
+/Times-Bold /LMRoman10-Bold def
+/Times-Italic /LMRoman10-Italic def
+/Times-BoldItalic /LMRoman10-BoldItalic def
+
+%mss8ttl10 LMSans10-Regular <t1-clm.enc <lmss10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
+%lmssbo8ttl10 LMSans10-BoldOblique <t1-clm.enc <lmssbo10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
+%lmssbx8ttl10 LMSans10-Bold <t1-clm.enc <lmssbx10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
+%lmssdc8ttl10 LMSansDemiCond10-Regular <t1-clm.enc <lmssdc10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
+%lmssdo8ttl10 LMSansDemiCond10-Oblique <t1-clm.enc <lmssdo10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
+%lmsso8ttl10 LMSans10-Oblique <t1-clm.enc <lmsso10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
+%dd-lmss10 LMSans10-Regular <dotdigits-clm.enc <lmss10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmssbo10 LMSans10-BoldOblique <dotdigits-clm.enc <lmssbo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmssbx10 LMSans10-Bold <dotdigits-clm.enc <lmssbx10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmssdc10 LMSansDemiCond10-Regular <dotdigits-clm.enc <lmssdc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmssdo10 LMSansDemiCond10-Oblique <dotdigits-clm.enc <lmssdo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmsso10 LMSans10-Oblique <dotdigits-clm.enc <lmsso10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+
+/Helvetica /LMSans10-Regular def
+/Helvetica-Bold /LMSans10-Bold def
+/Helvetica-Oblique /LMSans10-Oblique def
+/Helvetica-BoldOblique /LMSans10-BoldOblique def
+
+%dd-lmtcsc10 LMMonoCaps10-Regular <dotdigits-clm.enc <lmtcsc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtcso10 LMMonoCaps10-Oblique <dotdigits-clm.enc <lmtcso10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtk10 LMMonoLt10-Bold <dotdigits-clm.enc <lmtk10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtko10 LMMonoLt10-BoldOblique <dotdigits-clm.enc <lmtko10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtl10 LMMonoLt10-Regular <dotdigits-clm.enc <lmtl10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtlc10 LMMonoLtCond10-Regular <dotdigits-clm.enc <lmtlc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtlco10 LMMonoLtCond10-Oblique <dotdigits-clm.enc <lmtlco10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtlo10 LMMonoLt10-Oblique <dotdigits-clm.enc <lmtlo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtt10 LMMono10-Regular <dotdigits-clm.enc <lmtt10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtti10 LMMono10-Italic <dotdigits-clm.enc <lmtti10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+%dd-lmtto10 LMMonoSlant10-Regular <dotdigits-clm.enc <lmtto10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
+
+/Courier /LMMono10-Regular def
+/Courier-Bold /LMMono10-Bold def
+/Courier-Oblique /LMMono10-Italic def
+/Courier-BoldOblique /LMMono10-BoldOblique def
+
+/Symbol /StandardSymL def
+
+%end false setglobal
+%
+% end of file
+
Property changes on: trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro (rev 0)
+++ trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro 2018-05-02 20:47:43 UTC (rev 47572)
@@ -0,0 +1,32 @@
+% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z herbert $
+%
+%% PostScript font prologue for pstricks.tex.
+%% Version 0.01, 2016/04/22
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
+%
+%
+%true setglobal globaldict begin
+
+/Times-Roman /Times-Roman def
+/Times-Bold /Times-Bold def
+/Times-Italic /Times-Italic def
+/Times-BoldItalic /Times-BoldItalic def
+
+/Helvetica /Helvetica def
+/Helvetica-Bold /Helvetica-Bold def
+/Helvetica-Oblique /Helvetica-Oblique def
+/Helvetica-BoldOblique /Helvetica-BoldOblique def
+
+/Courier /Courier def
+/Courier-Bold /Courier-Bold def
+/Courier-Oblique /Courier-Oblique def
+/Courier-BoldOblique /Courier-BoldOblique def
+
+/Symbol /Symbol def
+
+%end false setglobal
+%
+% end of file
Property changes on: trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro (rev 0)
+++ trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro 2018-05-02 20:47:43 UTC (rev 47572)
@@ -0,0 +1,61 @@
+% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z herbert $
+%
+%% PostScript font prologue for pstricks.tex.
+%% Version 0.01, 2016/04/22
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
+%
+%
+%true setglobal globaldict begin
+
+%n021003l.pfa:/FontName /NimbusRomNo9L-Regu def
+%n021004l.pfa:/FontName /NimbusRomNo9L-Medi def
+%n021023l.pfa:/FontName /NimbusRomNo9L-ReguItal def
+%n021024l.pfa:/FontName /NimbusRomNo9L-MediItal def
+
+/Times-Roman /NimbusRomNo9L-Regu def
+/Times-Roman-Bold /NimbusRomNo9L-Medi def
+/Times-Italic /NimbusRomNo9L-ReguItal def
+/Times-BoldItalic /NimbusRomNo9L-MediItal def
+
+%n019003l.pfa:/FontName /NimbusSanL-Regu def
+%n019004l.pfa:/FontName /NimbusSanL-Bold def
+%n019023l.pfa:/FontName /NimbusSanL-ReguItal def
+%n019024l.pfa:/FontName /NimbusSanL-BoldItal def
+%n019043l.pfa:/FontName /NimbusSanL-ReguCond def
+%n019044l.pfa:/FontName /NimbusSanL-BoldCond def
+%n019063l.pfa:/FontName /NimbusSanL-ReguCondItal def
+%n019064l.pfa:/FontName /NimbusSanL-BoldCondItal def
+
+%/Helvetica /dd-lmss10 def
+/Helvetica /LMSans10-Regular def
+%/Helvetica /NimbusSanL-Regu def
+/Helvetica-Bold /NimbusSanL-Bold def
+/Helvetica-Oblique /NimbusSanL-ReguItal def
+/Helvetica-BoldOblique /NimbusSanL-BoldItal def
+
+%n022003l.pfa:/FontName /NimbusMonL-Regu cvn def
+%n022004l.pfa:/FontName /NimbusMonL-Bold cvn def
+%n022023l.pfa:/FontName /NimbusMonL-ReguObli cvn def
+%n022024l.pfa:/FontName /NimbusMonL-BoldObli cvn def
+
+/Courier /NimbusMonL-Regu def
+/Courier-Bold /NimbusMonL-Bold def
+/Courier-Oblique /NimbusMonL-ReguObli def
+/Courier-BoldOblique /NimbusMonL-BoldObli def
+
+%s050000l.pfa:/FontName /StandardSymL def
+
+/Symbol /StandardSymL def
+
+%p052003l.pfa:/FontName /URWPalladioL-Roma def
+%p052004l.pfa:/FontName /URWPalladioL-Bold def
+%p052023l.pfa:/FontName /URWPalladioL-Ital def
+%p052024l.pfa:/FontName /URWPalladioL-BoldItal def
+%z003034l.pfa:/FontName /URWChanceryL-MediItal def
+
+%end false setglobal
+%
+% end of file
Property changes on: trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def 2018-05-02 20:47:20 UTC (rev 47571)
+++ trunk/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def 2018-05-02 20:47:43 UTC (rev 47572)
@@ -1,6 +1,6 @@
-%% $Id: pstricks-tex.def 617 2017-10-04 16:16:21Z herbert $
+%% $Id: pstricks-tex.def 704 2018-01-06 09:50:33Z herbert $
%% pstricks-tex.def
-%% Copyright 2017 Herbert Voss
+%% Copyright 2017- Herbert Voss
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
Modified: trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex 2018-05-02 20:47:20 UTC (rev 47571)
+++ trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex 2018-05-02 20:47:43 UTC (rev 47572)
@@ -1,4 +1,4 @@
-%% $Id: pstricks.tex 702 2018-01-06 08:43:54Z herbert $
+%% $Id: pstricks.tex 726 2018-02-05 13:52:25Z herbert $
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz at nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
@@ -36,7 +36,9 @@
\expandafter\ifx\csname @latexerr\endcsname\relax % do we have TeX? then @latexerr isn't defined
\input pstricks-tex.def
\fi
-%
+
+\let\ifpstUndefined\@ifundefined
+
%\catcode`\@=\PstAtCode\relax
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
\ifx\PSTFPloaded\endinput\else\input pst-fp.tex\fi
@@ -78,8 +80,8 @@
\fi
\let\pgfforeach\foreach
%
-\def\fileversion{2.82}
-\def\filedate{2018/01/06}
+\def\fileversion{2.84}
+\def\filedate{2018/05/01}
\pst at addfams{pstricks}
%
%\define at boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -87,7 +89,7 @@
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
-\def\@fornoop#1\@@#2#3{}
+\long\def\@fornoop#1\@@#2#3{}
\long\def\@for#1:=#2\do#3{%
\pst at cntm=0
\expandafter\def\expandafter\@fortmp\expandafter{#2}%
@@ -3810,10 +3812,10 @@
\def\pswedge{\def\pst at par{}\pst at object{pswedge}}
\def\pswedge at i{\@ifnextchar({\pswedge at ii}{\pswedge at ii(0,0)}}
\def\pswedge at ii(#1)#2#3#4{%
- \begin at ClosedObj%
+ \begin at ClosedObj
\pssetlength\pst at dimc{#2}%
- \pst at getangle{#3}\pst at tempa%
- \pst at getangle{#4}\pst at tempb%
+ \pst at getangle{#3}\pst at tempa
+ \pst at getangle{#4}\pst at tempb
\pst@@getcoor{#1}%
\def\pst at linetype{1}%
\addto at pscode{
@@ -3822,13 +3824,12 @@
2 copy
moveto
\ifPst at SpecialLength \pst at SpecialLength \else \pst at number\pst at dimc \fi
-% \pst at number\pst at dimc
\psk at dimen CLW mul sub % Adjusted radius
\pst at tempa \pst at tempb
arc
closepath}%
- \showpointsfalse%
- \end at ClosedObj%
+ \showpointsfalse
+ \end at ClosedObj
}
\def\tx at ellipse#1{ \ifx\psk at rot\@empty 0 \else \psk at rot \fi #1 Ellipse }
\def\tx at Ellipse{ \ifx\psk at rot\@empty 0 \else \psk at rot \fi Ellipse }
@@ -4328,6 +4329,7 @@
\newif\ifshowgrid
\newdimen\sh at wgridXunit
\newdimen\sh at wgridYunit
+
\define at key[psset]{pstricks}{showgrid}[b]{\expandafter\pst@@showgrid#1!!\@nil}
\def\pst@@showgrid#1#2#3\@nil{% hv 20130403
\def\showgridp at s{0}%
Added: trunk/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty 2018-05-02 20:47:43 UTC (rev 47572)
@@ -0,0 +1,142 @@
+% $Id: pst-platform.sty 446 2017-04-19 11:40:55Z herbert $
+%%
+%% This is file `pst-platform.sty',
+%%
+%% Copyright (C) 2017 Herbert Voß <hvoss at tug.org>
+%%
+%% This package may be distributed under the terms of the LaTeX Project
+%% Public License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.0 or, at your option, any later version.
+%%
+\ProvidesPackage{pst-platform}
+ [2017/03/17 v0.01 Testing for the operating system, patch for luatex]
+\RequirePackage{shellesc,pdftexcmds,catchfile,ifluatex}
+%%
+% The following code is from ifplatform.sty, it fixes a bug with lualatex
+%%
+\newif\ifshellescape
+\newif\ifwindows
+\newif\ifmacosx
+\newif\iflinux
+\newif\ifcygwin
+\newcommand\windowsname{Windows}
+\newcommand\notwindowsname{*NIX}
+\newcommand\linuxname{Linux}
+\newcommand\macosxname{Mac\,OS\,X}
+\newcommand\cygwinname{Cygwin}
+\newcommand\unknownplatform{[Unknown]}
+\edef\ip at file{\jobname.w18}
+\newif\if at ip@nix@
+\ifnum\pdf at shellescape=1\relax
+ \shellescapetrue
+\else
+ \ifluatex\else
+ \PackageWarningNoLine{ifplatform}{^^J \space\space\space
+ shell escape is disabled,
+ so I can only detect \@backslashchar ifwindows%
+ }
+ \fi
+\fi
+\def\ip at cantdecide{%
+ \PackageWarningNoLine{ifplatform}{^^J \space\space\space
+ I can't tell if this is Windows or *nix;
+ you appear to be both%
+ }%
+}
+\ifluatex
+ \csname\directlua{
+ if os.type == "unix" then
+ tex.sprint("@ip at nix@true")
+ elseif os.type == "windows" then
+ tex.sprint("windowstrue")
+ end
+ }\endcsname
+\else
+ \IfFileExists{nul:}{\@ip at nix@false}{\@ip at nix@true}
+ \IfFileExists{/dev/null}{\windowsfalse}{\windowstrue}
+ \edef\ip at windows@echo at test{echo \string# > "\ip at file"}
+ \def\ip at backupplan{%
+ \IfFileExists{\ip at file}{%
+ \PackageWarningNoLine{ifplatform}{^^J \space\space\space
+ Please delete the file "\ip at file" and try again%
+ }%
+ \ip at cantdecide
+ }{%
+ \ShellEscape{\ip at windows@echo at test}%
+ \IfFileExists{\ip at file}{%
+ \ShellEscape{del "\ip at file"}%
+ \windowstrue
+ }{%
+ \@ip at nix@true
+ }%
+ }%
+ }
+ \ifwindows
+ \if at ip@nix@
+ \PackageWarningNoLine{ifplatform}{^^J \space\space\space
+ I can't tell if this is Windows or *nix;
+ you appear to be neither%
+ }
+ \fi
+ \else
+ \if at ip@nix@\else
+ \ifshellescape
+ \ip at backupplan
+ \else
+ \ip at cantdecide
+ \fi
+ \fi
+ \fi
+ \fi
+ \def\ip at only@six#1#2#3#4#5#6#7\@nil{#1#2#3#4#5#6}
+ \if at ip@nix@
+ \ifshellescape
+ \ifwindows\else
+ \ShellEscape{uname -s > "\ip at file"}
+ \CatchFileDef\@tempa{\ip at file}{}
+ \ShellEscape{rm -- "\ip at file"}
+ \edef\@tempa{\expandafter\zap at space\@tempa\@empty}
+ \def\@tempb{Linux}
+ \ifx\@tempa\@tempb
+ \linuxtrue
+ \else
+ \def\@tempb{Darwin}
+ \ifx\@tempa\@tempb
+ \macosxtrue
+ \else
+ \def\@tempb{CYGWIN}
+ \edef\@tempc{\expandafter\ip at only@six\@tempa------\@nil}
+ \ifx\@tempb\@tempc
+ \cygwintrue
+ \else
+ \edef\unknownplatform{\@tempa}
+ \fi
+ \fi
+ \fi
+ \fi
+\fi\fi
+\edef\platformname{%
+ \ifwindows
+ \noexpand\windowsname
+ \else
+ \ifshellescape
+ \iflinux
+ \noexpand\linuxname
+ \else
+ \ifmacosx
+ \noexpand\macosxname
+ \else
+ \ifcygwin
+ \noexpand\cygwinname
+ \else
+ \noexpand\unknownplatform
+ \fi
+ \fi
+ \fi
+ \else
+ \noexpand\notwindowsname
+ \fi
+ \fi
+}
+%%
+%% End of file `pst-platform.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty 2018-05-02 20:47:43 UTC (rev 47572)
@@ -0,0 +1,179 @@
+% $Id: pstricks-pdf.sty 446 2017-04-19 11:40:55Z herbert $
+%%
+%% This is file `pstricks-pdf.sty'.
+%%
+%% IMPORTANT NOTICE:
+%%
+%% pstricks-pdf.sty Copyright (C) 2017 Herbert Voss <hvoss at tug.org>
+%%
+%% This package may be distributed under the terms of the LaTeX Project
+%% Public License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.0 or, at your option, any later version.
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+
+\ProvidesPackage{pstricks-pdf}[2017/03/17 v0.01 creating pdf output (HV)]
+%
+\RequirePackage{ifpdf,xkeyval,pst-platform,ifluatex,ifxetex}
+
+\newif\if at app@off@
+\newif\if at app@crop@
+\newcounter{app at runs}
+\def\app at suffix{autopp}
+\edef\app at jobname{\jobname-\app at suffix}
+\edef\app at pics{\jobname-pics.pdf}
+
+%%%
+% the following code is adapted from auto-pst-pdf
+%%%
+\DeclareOptionX{off}[]{\@app at off@true}
+\define at choicekey{pstricks-pdf.sty}{crop}[\@tempa\@tempb]{on,off}{%
+ \ifcase\@tempb\relax
+ \@app at crop@true
+ \or
+ \@app at crop@false
+ \fi}
+\DeclareOptionX{on}[]{\@app at off@false}
+\DeclareOptionX{ext}{\def\app at ext{#1}}
+\DeclareOptionX{latex}{%
+ \def\app at latex@opts{%
+ \ifwindows
+ -disable-write18
+ \else
+ -no-shell-escape
+ \fi
+ -jobname="\app at jobname"
+ -interaction=batchmode
+ #1}}
+\DeclareOptionX{dvips}{\def\app at dvips@opts{#1}}
+\DeclareOptionX{pspdf}{\def\app at pspdf@opts{#1}}
+\def\app at pdfcrop@opts{--hres}%%% hv 20130405
+\DeclareOptionX{pdfcrop}{\def\app at pdfcrop@opts{#1}}
+
+\DeclareOptionX{cleanup}{%
+ \let\app at rm@files\@empty
+ \@for\@ii:=#1\do{%
+ \edef\app at rm@files{\app at rm@files,\app at jobname.\@ii}}}
+
+\DeclareOptionX{runs}{%
+ \setcounter{app at runs}{#1}% support calc
+ \ifnum\c at app@runs > \z@
+ \else
+ \app at PackageWarning{The number of runs must be at least one.}%
+ \c at app@runs\@ne
+ \fi}
+
+\DeclareOptionX*{%
+ \PassOptionsToPackage{prologue}{xcolor}% to get named colors into the ps file
+ \PassOptionsToPackage\CurrentOption{pstricks}%
+ \PassOptionsToPackage\CurrentOption{pst-pdf}%
+}
+
+\ExecuteOptionsX{%
+ ext=tex,
+ crop=on,
+ latex={},
+ dvips={-Ppdf},
+ pdfcrop={},
+ cleanup={log,aux,dvi,ps,pdf},
+ runs=1
+}
+\ifwindows
+ \ExecuteOptionsX{pspdf={}}
+\else
+ \ExecuteOptionsX{pspdf={-dAutoRotatePages=/None}}
+\fi
+%
+\ProcessOptionsX\relax
+%
+\ifxetex\@app at off@true\fi
+%
+\def\app at nl{^^J\space\space\space\space}
+\newcommand\app at PackageError[2]{\PackageError{pstricks-pdf}{\app at nl #1^^J}{#2}}
+\newcommand\app at PackageWarning[1]{%
+ \PackageWarning{pstricks-pdf}{\app at nl #1^^JThis warning occured}}
+\newcommand\app at PackageInfo[1]{\PackageInfo{pstricks-pdf}{#1}}
+\newcommand\OnlyIfFileExists[2]{\IfFileExists{#1}{#2}{}}
+\newcommand\NotIfFileExists[2]{\IfFileExists{#1}{}{#2}}
+\def\app at convert#1#2#3{%
+ \OnlyIfFileExists{#2}{%
+% \expandafter\typeout\expandafter{\csname app at cmd@#1\endcsname}%
+ \typeout{filenameIN: #2}%
+ \typeout{filenameOUT: #3}%
+ \ShellEscape{\csname app at cmd@#1\endcsname{#2}{#3}}%
+ \NotIfFileExists{#3}{\app at PackageWarning{Creation of #3 failed.}}}}
+\def\app at compile{%
+ \app at cleanup
+ \app at remove@container
+ \loop\ifnum\c at app@runs > \@ne
+ \app at convert{extralatex}{\jobname.\app at ext}{}%
+ \advance\c at app@runs\m at ne
+ \repeat
+ \app at convert{latex}{\jobname.\app at ext}{}%
+ \ifxetex\else
+ \app at convert{dvips}{\app at jobname.dvi}{\app at jobname.ps}%
+ \fi
+ \if at app@crop@
+ \ifxetex\else
+ \app at convert{pstopdf}{\app at jobname.ps}{\app at jobname.pdf}%
+ \fi
+ \app at convert{pdfcrop}{\app at jobname.pdf}{\app at pics}%
+ \else
+ \ifxetex\else
+ \app at convert{pstopdf}{\app at jobname.ps}{\app at pics}%
+ \fi
+ \fi
+ \IfFileExists{\app at pics}
+ {\app at cleanup}
+ {\app at PackageWarning{Could not create \app at pics.
+ Auxiliary files not deleted.}}}
+\edef\app at rm{\ifwindows del \else rm -- \fi}
+\newcommand\app at try@rm[1]{%
+ \@for\@tempa:=#1\do{%
+ \OnlyIfFileExists{\@tempa}{\ShellEscape{\app at rm "\@tempa"}}}}
+\def\app at remove@container{\app at try@rm{\app at pics}}
+\def\app at cleanup{\app at try@rm{\app at rm@files}}
+\ifluatex
+% \def\app at cmd@latex#1#2{lualatex --output-format=dvi \app at latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"}
+% \def\app at cmd@extralatex#1#2{lualatex --output-format=dvi \app at latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"}
+ \def\app at cmd@latex#1#2{xelatex \app at latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\empty\input} #1"}
+ \def\app at cmd@extralatex#1#2{xelatex \app at latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\undefined\input} #1"}
+\else
+ \def\app at cmd@latex#1#2{latex \app at latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"}
+ \def\app at cmd@extralatex#1#2{\@app at prog\space \app at latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"}
+ \def\app at cmd@dvips#1#2{dvips \app at dvips@opts\space -o "#2" "#1"}
+ \def\app at cmd@pstopdf#1#2{ps2pdf \app at pspdf@opts\space "#1" "#2"}
+\fi
+\def\app at cmd@pdfcrop#1#2{pdfcrop \app at pdfcrop@opts\space "#1" "#2"}
+\ifpdf
+ \if at app@off@\else
+ \ShellEscape{echo " "}
+ \ShellEscape{echo "-------------------------------------------------"}
+ \ShellEscape{echo "pstricks-pdf: Auxiliary LaTeX compilation"}
+ \ShellEscape{echo "-------------------------------------------------"}
+ \app at compile
+ \ShellEscape{echo "-------------------------------------------------"}
+ \ShellEscape{echo "pstricks-pdf: End auxiliary LaTeX compilation"}
+ \ShellEscape{echo "-------------------------------------------------"}
+ \fi
+ \if at app@crop@
+ \PassOptionsToPackage{notightpage}{pst-pdf}
+ \fi
+\else
+ \ifx\APPmakepictures\@undefined
+ \PassOptionsToPackage{inactive}{pst-pdf}
+ \else
+ \if at app@crop@
+ \PassOptionsToPackage{notightpage}{pst-pdf}
+ \fi
+ \fi
+\fi
+\RequirePackage{pst-pdf}
+\RequirePackage{pstricks}
+\@ifclassloaded{beamer}{\setbeamertemplate{navigation symbols}}{}%
+%
+\let\app at ig\includegraphics
+%
+%%
+%% End of file `pstricks-pdf.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty 2018-05-02 20:47:20 UTC (rev 47571)
+++ trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty 2018-05-02 20:47:43 UTC (rev 47572)
@@ -1,4 +1,4 @@
-% $Id: pstricks.sty 680 2017-12-05 12:22:55Z herbert $
+% $Id: pstricks.sty 704 2018-01-06 09:50:33Z herbert $
%%
%% This is file `pstricks.sty'.
%%
@@ -50,6 +50,7 @@
%---------------------------------COLOR --------------------------------
\DeclareOption{monochrome}{%
\AtBeginDocument{\special{ps:
+ true setglobal globaldict begin
/setrgbcolor { add add 0 gt {1}{0} ifelse setgray } def
/setcmykcolor{ 4 dict begin
/k ED /y ED /m ED /c ED
@@ -56,10 +57,12 @@
1 1 k sub c mul k add sub 0.29 mul
1 1 k sub m mul k add sub 0.587 mul add
1 1 k sub y mul k add sub 0.114 mul add
- end 0 gt {1}{0} ifelse setgray } def }}}
+ end 0 gt {1}{0} ifelse setgray } def
+ end false setglobal }}}
\DeclareOption{grayscale}{%
\AtBeginDocument{\special{ps:
+ true setglobal globaldict begin
/setrgbcolor { 0.07 mul exch 0.71 mul add exch 0.21 mul add setgray } def
/setcmykcolor{ 4 dict begin
/k ED /y ED /m ED /c ED
@@ -66,7 +69,8 @@
1 1 k sub c mul k add sub 0.29 mul
1 1 k sub m mul k add sub 0.587 mul add
1 1 k sub y mul k add sub 0.114 mul add
- end setgray } def }}}
+ end setgray } def
+ end false setglobal }}}
\DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst at ColorPackage}}
\ProcessOptions\relax
More information about the tex-live-commits
mailing list