diff options
18 files changed, 568 insertions, 596 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Makefile b/Master/texmf-dist/doc/generic/pstricks/Makefile deleted file mode 100644 index 0b4f5519d33..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/Makefile +++ /dev/null @@ -1,95 +0,0 @@ -# `Makefile' for `pst-news.pdf', hv, 2007/03/17 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -PACKAGE = pst-news$(shell date +%y) - -MAIN = $(PACKAGE) - -BASE = pstricks-base - -TDSBASE = pstricks - -LATEX = latex - -TDS = ~/PSTricks/PSTricks-TDS - -ARCHNAME = $(MAIN)-$(shell date +%y%m%d) - -ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile - -all : doc clean -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps - GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< - -$(MAIN).ps : $(MAIN).dvi - dvips $< - -$(MAIN).dvi : $(MAIN).tex - $(LATEX) $< - $(LATEX) $< - if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi - if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi - makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ - $(basename $<).glo - makeindex -t $(basename $<).ilg -o $(basename $<).ind \ - $(basename $<).idx - biber $(basename $<) - $(LATEX) $< - $(LATEX) $< - -clean : - $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl ) - $(RM) $(addprefix $(MAIN), .dvi .ps .bcf .run.xml) - -veryclean : clean - $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) - -arch : - zip $(ARCHNAME).zip $(ARCHFILES) - -tds: -#################### base ######################### - cp -u ../config/* ../.base/$(BASE)/config/ -# - cp -u ../Changes ../.base/$(BASE)/ - cp -u pst-doc.* ../.base/$(BASE)/doc/ - cp -u PSTricks.bib* ../.base/$(BASE)/doc/ - cp -u pst-news* ../.base/$(BASE)/doc/ - cp -u pst-user* ../.base/$(BASE)/doc/ - cp -u *.sty ../.base/$(BASE)/doc/ - cp -u pstricks-* ../.base/$(BASE)/doc/ - cp -u test* ../.base/$(BASE)/doc/ - cp -u images/* ../.base/$(BASE)/doc/images/ -# - cp -u ../dvips/* ../.base/$(BASE)/dvips/ - cp -u ../generic/* ../.base/$(BASE)/generic/ - cp -u ../latex/* ../.base/$(BASE)/latex/ - cp -u ../README ../.base/$(BASE)/ -# -#################### TDS ######################### - cp -u ../Changes $(TDS)/doc/generic/$(TDSBASE)/ -# cp -u README $(TDS)/doc/generic/$(TDSBASE)/ - cp -u $(MAIN).pdf $(TDS)/doc/generic/$(TDSBASE)/ -# -# cp -u ../latex/Changes $(TDS)/tex/latex/$(TDSBASE)/ - cp -u ../latex/* $(TDS)/tex/latex/$(TDSBASE)/ -# -# cp -u ../generic/Changes $(TDS)/tex/generic/$(TDSBASE)/ - cp -u ../generic/* $(TDS)/tex/generic/$(TDSBASE)/ -# -# cp -u ../dvips/Changes $(TDS)/dvips/$(TDSBASE)/ -# cp -u ../dvips/$(BASE).pro $(TDS)/dvips/$(TDSBASE)/ -# cp -u ../dvips/$(BASE)97.pro $(TDS)/dvips/$(TDSBASE)/ - cp -u ../dvips/*.pro $(TDS)/dvips/$(TDSBASE)/ -# -# cp -u Changes $(TDS)/source/$(TDSBASE)/ - cp -u $(MAIN).tex $(TDS)/source/$(TDSBASE)/ -# cp -u $(MAIN).bib $(TDS)/source/$(TDSBASE)/ - cp -u Makefile $(TDS)/source/$(TDSBASE)/ - - cp -u ../dvips/*.pro ~/Links/dvips-local/ - -# EOF diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf Binary files differdeleted file mode 100644 index 6666f0a0244..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf Binary files differindex 2a991b265ab..9360b231c20 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex index 563c5943ec8..8d0669e3d0f 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex @@ -1,12 +1,9 @@ -%% $Id: pst-news17.tex 444 2017-04-19 10:55:35Z herbert $ +%% $Id: pst-news17.tex 616 2017-10-04 16:14:42Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles \let\Lfile\LFile \usepackage[utf8]{inputenc} -\usepackage{pstricks} -\let\pstricksFV\fileversion -\let\pstricksFD\filedate \usepackage{pst-node} \let\pstnodeFV\fileversion \let\pstnodeFD\filedate @@ -38,25 +35,102 @@ basic package \nxLFile{pstricks}} \clearpage \part{\texttt{pstricks} -- package} -\iffalse %-------------------------------------------------------------------------------------- \section{\texttt{pstricks.sty} -- \texttt{pstricks-pdf.sty}} %-------------------------------------------------------------------------------------- + +There is now a new optional argument for the package: \Loption{psfonts}. If it is +enabled PSTricks will use the original PostScript fonts like Helvetica, Times, \ldots. +The default is to use the URW fonts (Nimbus Roman, Nimbus Sans, \ldots) which are embedded by default! +The PostScript fonts are only embedded if present on your system. %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks-pdf.sty}} +\section{\texttt{pstricks-tex.tex}} %-------------------------------------------------------------------------------------- -This package allows to use pstricks code with \Lprog{pdflatex} or \Lprog{lualatex}. -All optional arguments of package \LPack{auto-pst-pdf} are possible. In difference to -this package \LPack{pstricks-pdf} has no problems with running \Lprog{lualatex}. -Internally \Lprog{lualatex} starts \Lprog{xelatex} for creating the environments -\Lenv{pspicture} as single images. +This package collects all additional latex macros which must be definied +when running PSTricks with tex. They all moved from the base \texttt{pstricks.tex} into +this new file. -\fi %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)} +\section{\texttt{pstricks.tex} (v. 2.76 -- 2017/09/17)} %-------------------------------------------------------------------------------------- + + +\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 +NimbusSanL-Regu. The URW fonts are always embedded in the created ps or pdf output. +This is not the default for the PostScript fonts. You change this setting with the optional +argument to \LPack{pstricks.sty}. + + +\subsection{Error message} + +Using PSTricks with \Lprog{pdflatex} will work only when using package +\LPack{auto-pst-pdf} and running the \TeX-file with + +\begin{verbatim} +pdflatex -shell-escape <file> +\end{verbatim} + +otherwise you'll get an error message which was misleading in the past: + +\begin{verbatim} +[...] +! Undefined control sequence. +<recently read> \c@lor@to@ps +\end{verbatim} + +This changes now to + + +\begin{verbatim} +[...] +! Undefined control sequence. +\c@lor@to@ps ->\PSTricks + _Not_Configured_For_This_Format +\end{verbatim} + +\subsection{Random colors} +There are now four predefined random ''colors``: + +\begin{verbatim} + \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}% +\end{verbatim} + +\begin{LTXexample}[pos=t] +\begin{pspicture}(10,5) +\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomgray,linewidth=1mm](0,\rA)(10,\rA)} +\end{pspicture} +\end{LTXexample} + +\begin{LTXexample}[pos=t] +\begin{pspicture}(10,5) +\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomrgb,linewidth=1mm](0,\rA)(10,\rA)} +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[pos=t] +\begin{pspicture}(10,5) +\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomcmyk,linewidth=1mm](0,\rA)(10,\rA)} +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[pos=t] +\begin{pspicture}(10,5) +\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomhsb,linewidth=1mm](0,\rA)(10,\rA)} +\end{pspicture} +\end{LTXexample} + + +The random counter can be initialized with \verb|\pstVerb{rrand srand}|. + \subsection{refangle} This version fixes a bug with \verb|pst@refangle| which is used inside PostScript. @@ -89,12 +163,12 @@ area of the \Lenv{pspicture} coordinates is seen by a rectangle (only for \LaTe \end{LTXexample} -\subsection{\Lcs{newpsstyle}} +\subsection{\nxLcs{newpsstyle}} The command \Lcs{newpsstyle} has a new syntax: \begin{BDef} -\Lcs{newpssytle}\OptArg{package name}\Largb{name}\Largb{definitions} +\Lcs{newpsstyle}\OptArg{package name}\Largb{name}\Largb{definitions} \end{BDef} For example @@ -105,6 +179,32 @@ For example \end{verbatim} +%-------------------------------------------------------------------------------------- +\section{\texttt{pstricks.pro}} +%-------------------------------------------------------------------------------------- + +A full circle has by default an angle of 360 degrees. +Setting the circle with \Lcs{degrees}\Largs{17} to another value doesn't work for the +PostScript function \texttt{PtoC} (Polat to Cartesian -- $(r,\phi)\rightarrow (x,y)$). +Now there is a \texttt{PtoCrel} for the new definition +which now takes +the setting of \Lcs{pst@angleunit} into account. + +\bigskip +\begin{LTXexample}[pos=t] +\degrees[16] +\begin{pspicture}[showgrid](-2,-2)(2,2) +\psline[linecolor=blue](!1.8 2 PtoCrel)% 45 degrees +\end{pspicture} +\end{LTXexample} + +The command \Lcs{framed} was build by clockwise line sequence. Now it is the +other way round to get the same behaviour as for all other commands +with closed lines. + + + + \clearpage \nocite{*} \printbibliography @@ -114,4 +214,3 @@ For example \end{document} - diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf Binary files differdeleted file mode 100644 index 24d8d07b21e..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf +++ /dev/null diff --git a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro new file mode 100644 index 00000000000..5ab5e436dfd --- /dev/null +++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro @@ -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 + diff --git a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro new file mode 100644 index 00000000000..da5cdb7a1ee --- /dev/null +++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro @@ -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 diff --git a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro new file mode 100644 index 00000000000..a0dd8bdda59 --- /dev/null +++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro @@ -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 diff --git a/Master/texmf-dist/dvips/pstricks/pstricks-fonts.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts.pro new file mode 100644 index 00000000000..a0dd8bdda59 --- /dev/null +++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts.pro @@ -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 diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index 0beb82a6a04..9fc3be31019 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,7 +1,7 @@ -% $Id: pstricks.pro 554 2017-09-17 19:04:49Z herbert $ +% $Id: pstricks.pro 616 2017-10-04 16:14:42Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.27, 2017/09/23 +%% Version 1.27, 2017/09/18 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -55,7 +55,7 @@ tx@Dict begin sub % yB-yA xA-xB Pyth } def /PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian (origimal) -/PtoCrel { pst@angleunit 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian +/PtoCrel { pst@angleunit 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian with \degrees[??] /PtoCab { dup cos 4 -1 roll mul 3 1 roll sin mul } def % Polar to Cartesian (Ellipse) a b phi-> x y %/Rand { rand 4294967295 div } def % a real random number /Rand { rand 2147483447 div } def % a real random number between 0 and 1 @@ -985,7 +985,8 @@ gsave % Helvetica findfont b scalefont setfont % is set in pstricks.tex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - /b b .95 mul CLW 2 div add def } if + /NimbusSanL-Regu findfont b scalefont setfont + /b b .95 mul CLW 2 div add def } if systemdict /setstrokeadjust known { true setstrokeadjust /t { } def } { /t { transform 0.25 sub round 0.25 add exch 0.25 sub round 0.25 add diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex index 2ea9cf11f4f..2d4e748193a 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex @@ -1,4 +1,4 @@ -%% $Id: pst-fp.tex 446 2017-04-19 11:40:55Z herbert $ +%% $Id: pst-fp.tex 465 2017-05-22 17:50:57Z herbert $ %% %% %% This is file `pst-fp.tex', @@ -121,12 +121,12 @@ \def\pstFP@swallow#1\relax{} % \def\ifpstFP@zero#1{% - \ifnum% - \expandafter\ifnum\csname pstFP@#1ia\endcsname=0 0\else1\fi% - \expandafter\ifnum\csname pstFP@#1ib\endcsname=0 0\else1\fi% - \expandafter\ifnum\csname pstFP@#1fa\endcsname=0 0\else1\fi% + \ifnum + \expandafter\ifnum\csname pstFP@#1ia\endcsname=0 0\else1\fi + \expandafter\ifnum\csname pstFP@#1ib\endcsname=0 0\else1\fi + \expandafter\ifnum\csname pstFP@#1fa\endcsname=0 0\else1\fi \expandafter\ifnum\csname pstFP@#1fb\endcsname=0 0\else1\fi% - =0\relax% + =0\relax } % %read value @@ -485,7 +485,8 @@ \fi% \global\let\pstFP@tmp\pstFP@tmp% }% - \let#1\pstFP@tmp% +% \pstFPstripZeros\pstFP@tmp{#1}% + \let#1\pstFP@tmp } @@ -581,7 +582,8 @@ \global\let\pstFP@tmp=\pstFP@tmp% % }% - \let#1\pstFP@tmp% +% \pstFPstripZeros\pstFP@tmp{#1}% + \let#1\pstFP@tmp } %multiply two values @@ -705,7 +707,8 @@ \else\typeout{pstFPmul: Overflow}\fi% \else\typeout{pstFPmul: Overflow}\fi% \global\let\pstFP@tmp\pstFP@tmp}% - \let#1\pstFP@tmp% +% \pstFPstripZeros\pstFP@tmp{#1}% + \let#1\pstFP@tmp } % \catcode`\@=\PstAtCode\relax diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def new file mode 100644 index 00000000000..f711b7589f8 --- /dev/null +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def @@ -0,0 +1,84 @@ +%% $Id: pstricks-tex.def 617 2017-10-04 16:16:21Z herbert $ +%% pstricks-tex.def +%% 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 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2003/12/01 or later. +% + \newwrite\@unused + \def\typeout#1{\immediate\write\@unused{#1}}% + \typeout{we are running tex and have to make it etex and latex compatible ...}% + \ifx\eTeXversion\@undefined + \gdef\ch@ck#1#2#3{\ifnum\count1#1<#2 \else\errmessage{No room for a new #3}\fi} + \countdef\allocationnumber=21 + \chardef\sixt@@n=16 + \def\alloc@#1#2#3#4#5{\global\advance\count1#1\@ne + \ch@ck#1#4#2% make sure there's still room + \allocationnumber\count1#1% + \global#3#5\allocationnumber + \wlog{\string#5=\string#2\the\allocationnumber}} + \alloc@7\write\chardef\sixt@@n\@unused + \else + \def\e@alloc#1#2#3#4#5#6{% + \global\advance#3\@ne + \e@ch@ck{#3}{#4}{#5}#1% + \allocationnumber#3\relax + \global#2#6\allocationnumber + \wlog{\string#6=\string#1\the\allocationnumber}}% + \gdef\e@ch@ck#1#2#3#4{% + \ifnum#1<#2\else + \ifnum#1=#2\relax + \global#1\@cclvi + \ifx\count#4\global\advance#1 10 \fi + \fi + \ifnum#1<#3\relax + \else + \errmessage{No room for a new \string#4}% + \fi + \fi}% + \fi +% + \newif\ifpst@psfonts \pst@psfontsfalse % 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} + \def\@nameuse#1{\csname #1\endcsname} + \def\@eha{% + Your command was ignored.^^J + Type \space I <command> <return> \space to replace + it with another command,^^J + or \space <return> \space to continue without it.} + \def\@spaces{\space\space\space\space} + \def\@empty{} + \def\@gobble#1{} + \def\@nnil{\@nil} +% + \def\@ifnextchar#1#2#3{% + \let\@tempe#1\def\@tempa{#2}\def\@tempb{#3}\futurelet\@tempc\@ifnch} +% + \def\@ifnch{% + \ifx\@tempc\@sptoken \let\@tempd\@xifnch + \else\ifx\@tempc\@tempe \let\@tempd\@tempa \else \let\@tempd\@tempb \fi + \fi + \@tempd% + }% + \begingroup + \def\:{\global\let\@sptoken= } \: + \def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch} + \endgroup + \def\endtabular{\crcr\egroup\egroup $\egroup} + \def\@width{width}% needed by pst-node + \def\@tfor#1:={\@tf@r#1 } + \long\def\@tf@r#1#2\do#3{\def\@fortmp{#2}\ifx\@fortmp\space\else + \@tforloop#2\@nil\@nil\@@#1{#3}\fi}% + \long\def\@tforloop#1#2\@@#3#4{\def#3{#1}\ifx #3\@nnil + \expandafter\@fornoop \else + #4\relax\expandafter\@tforloop\fi#2\@@#3{#4}} + \long\def\@break@tfor#1\@@#2#3{\csname fi\endcsname\csname fi\endcsname} +%% +%% END: pstricks-tex.def diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.con b/Master/texmf-dist/tex/generic/pstricks/pstricks.con index fa94f812175..83bba1f7bbc 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.con +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.con @@ -1,3 +1,4 @@ +%% $Id: pstricks.con 617 2017-10-04 16:16:21Z herbert $ %% BEGIN: pstricks.con (for dvips driver) %% %% Configuration file for PSTricks diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 24722d45cbe..e2d1405feda 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -1,3 +1,4 @@ +%% $Id: pstricks.tex 617 2017-10-04 16:16:21Z herbert $ %% pstricks.tex %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. %% COPYRIGHT 2000-2003 by Denis Girou. @@ -17,90 +18,28 @@ % \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput -% -%% !! loading additional TeX packages see line 112 !! -%% !! loading config file pstricks.con line 476 !! -%% !! loading pro files line 489 !! -%% !! fileversion and date see line 119 !! +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% !! 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 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax % -\expandafter\ifx\csname @latexerr\endcsname\relax % do we have LaTeX? then it is false - \newwrite\@unused - \def\typeout#1{\immediate\write\@unused{#1}}% - \ifx\eTeXversion\@undefined - \gdef\ch@ck#1#2#3{\ifnum\count1#1<#2 \else\errmessage{No room for a new #3}\fi} - \countdef\allocationnumber=21 - \chardef\sixt@@n=16 - \def\alloc@#1#2#3#4#5{\global\advance\count1#1\@ne - \ch@ck#1#4#2% make sure there's still room - \allocationnumber\count1#1% - \global#3#5\allocationnumber - \wlog{\string#5=\string#2\the\allocationnumber}} - \alloc@7\write\chardef\sixt@@n\@unused - \else - \def\e@alloc#1#2#3#4#5#6{% - \global\advance#3\@ne - \e@ch@ck{#3}{#4}{#5}#1% - \allocationnumber#3\relax - \global#2#6\allocationnumber - \wlog{\string#6=\string#1\the\allocationnumber}}% - \gdef\e@ch@ck#1#2#3#4{% - \ifnum#1<#2\else - \ifnum#1=#2\relax - \global#1\@cclvi - \ifx\count#4\global\advance#1 10 \fi - \fi - \ifnum#1<#3\relax - \else - \errmessage{No room for a new \string#4}% - \fi - \fi}% - \fi - \typeout{we are running tex and have to define some LaTeX commands ...}% - \long\def\@ifundefined#1#2#3{\expandafter\ifx\csname #1\endcsname\relax#2\else#3\fi} - \def\@namedef#1{\expandafter\def\csname #1\endcsname} - \def\@nameuse#1{\csname #1\endcsname} - \def\@eha{% - Your command was ignored.^^J - Type \space I <command> <return> \space to replace - it with another command,^^J - or \space <return> \space to continue without it.} - \def\@spaces{\space\space\space\space} - \def\@empty{} - \def\@gobble#1{} - \def\@nnil{\@nil} -% - \def\@ifnextchar#1#2#3{% - \let\@tempe#1\def\@tempa{#2}\def\@tempb{#3}\futurelet\@tempc\@ifnch} -% - \def\@ifnch{% - \ifx\@tempc\@sptoken \let\@tempd\@xifnch - \else\ifx\@tempc\@tempe \let\@tempd\@tempa \else \let\@tempd\@tempb \fi - \fi - \@tempd% - } - \begingroup - \def\:{\global\let\@sptoken= } \: - \def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch} - \endgroup - \def\endtabular{\crcr\egroup\egroup $\egroup} - \def\@width{width}% needed by pst-node - \def\@tfor#1:={\@tf@r#1 } - \long\def\@tf@r#1#2\do#3{\def\@fortmp{#2}\ifx\@fortmp\space\else - \@tforloop#2\@nil\@nil\@@#1{#3}\fi}% - \long\def\@tforloop#1#2\@@#3#4{\def#3{#1}\ifx #3\@nnil - \expandafter\@fornoop \else - #4\relax\expandafter\@tforloop\fi#2\@@#3{#4}} - \long\def\@break@tfor#1\@@#2#3{\csname fi\endcsname\csname fi\endcsname} -\fi% -\catcode`\@=\PstAtCode\relax +\ifx\c@lor@to@ps\@undefined + \def\c@lor@to@ps{\PSTricks_Not_Configured_For_This_Format}% message for a pdflatex run +\fi +\expandafter\ifx\csname @latexerr\endcsname\relax % do we have TeX? then @latexerr isn't defined + \input pstricks-tex.def +\fi % -% now we have all commands defined, for TeX and LaTeX +%\catcode`\@=\PstAtCode\relax +\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi +\ifx\PSTFPloaded\endinput\else\input pst-fp.tex\fi % -\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi -\catcode`\@=11\relax +%\catcode`\@=11\relax \def\XKV@ch@ckch@ice#1#2#3{% bugfix for xkeyval \def\XKV@tempa{#1}% \ifx\XKV@tempa\@nnil\let\XKV@tempa\@empty\else @@ -127,21 +66,23 @@ \XKV@tempa } % -\def\ProvidesPackageRCS{\@ifnextchar[\ProvidesPackageRCS@i{\ProvidesPackageRCS@i[] }} %$ +\def\ProvidesPackageRCS{\@ifnextchar[\ProvidesPackageRCS@i{\ProvidesPackageRCS@i[] }}%$ \def\ProvidesPackageRCS@i[#1] $#2${} %$ -\catcode`\@=\PstAtCode\relax -\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi -% -\@ifundefined{pgfutil@empty}{\input pgfutil-common.tex}{} -\@ifundefined{pgkeys@empty}{\input pgfkeys.code.tex}{} -\@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{} + +\ifx\pgfkeysloaded\endinput\else + \input pgfutil-common.tex + \input pgfkeys.code.tex + \input pgffor.code.tex +\fi \let\pgfforeach\foreach % -\def\fileversion{2.72b} -\def\filedate{2017/04/19} -\catcode`\@=11\relax +\def\fileversion{2.77} +\def\filedate{2017/10/04} \pst@addfams{pstricks} % +%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} +%\psset{useURWfonts} +% % stolen from latex.ltx to make it TeX compatible \newcount\psLoopIndex \def\@fornoop#1\@@#2#3{} @@ -510,6 +451,7 @@ \@ifundefined{pst@ATH}{\def\pst@ATH<#1>{}}{} % \pstheader{pstricks.pro} +%\pstheader{pstricks-fonts.pro} \pstheader{pst-algparser.pro} \pstheader{pst-tools.pro} % @@ -624,7 +566,7 @@ \gdef\pslbrace[{ ] \gdef\psrbrace[} ] \endgroup - +% \pstVerb{ /pssetRGBcolor /setrgbcolor load def /pssetCMYKcolor /setcmykcolor load def @@ -635,8 +577,8 @@ %\expandafter\edef\csname color@#1\endcsname{#2}% \expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 \ignorespaces} -\def\pst@color#1{% - \def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% +% +\def\pst@color#1{\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% \def\pst@endcolor{\pstVerb{\pst@currentcolor}} \def\pst@currentcolor{0 setgray} \def\altcolormode{% @@ -678,8 +620,8 @@ \def\pst@usecolor#1{\csname\string\color@#1\endcsname\space} % \def\newgray#1#2{% - \pst@checknum{#2}\pst@tempg - \@newcolor{#1}{\pst@tempg setgray}} + \pst@checknum{#2}\pst@tempg + \@newcolor{#1}{\pst@tempg setgray}}% \def\newrgbcolor#1#2{% \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}} @@ -700,6 +642,18 @@ \newrgbcolor{yellow}{1 1 0} \newrgbcolor{cyan}{0 1 1} \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}% + }{% + \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}% + } % \define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{} \define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture @@ -832,10 +786,12 @@ \def\@degrees[#1]{% \pst@checknum{#1}\pst@tempg \edef\pst@angleunit{360 \pst@tempg div mul }% + \pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}% \ignorespaces} % -\def\radians{\def\pst@angleunit{57.2956 mul }} -\def\pst@angleunit{} +\def\radians{\def\pst@angleunit{57.2956 mul }}% +\def\pst@angleunit{}% +\pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}% % \def\SpecialCoor{% \def\pst@@getcoor##1{% @@ -1069,18 +1025,16 @@ \fi\fi} % \def\special@length#1#2\@nil#3{% - \psDEBUG[special@length]{ #1|#2|#3 }% \ifx !#1\relax \edef\pst@SpecialLength{ #2 \pst@number\psunit mul }% - \Pst@SpecialLengthtrue% - \psDEBUG[special@length]{ Special length: \pst@SpecialLength}% + \Pst@SpecialLengthtrue \else \let\@psunit\psunit \afterassignment\pstunit@off - #3 #1#2\@psunit% - \Pst@SpecialLengthfalse% - \psDEBUG[special@length]{ Normal length: \the#3 }% - \fi} + #3 #1#2\@psunit + \Pst@SpecialLengthfalse + \fi +} % \def\Cartesian{% \def\cartesian@coor##1,##2,##3\@nil{% @@ -1105,14 +1059,14 @@ \def\psk@origin{} % \define@boolkey[psset]{pstricks}[Pst@]{algebraic}[true]{} -\psset%[pstricks] -{algebraic=false} +\psset{algebraic=false} % -\define@boolkey[psset]{pstricks}[]{swapaxes}[true]{% \if@pst +\define@boolkey[psset]{pstricks}[]{swapaxes}[true]{% \if@pst \@nameuse{@pst#1}% \if@pst\def\psk@swapaxes{-90 rotate -1 1 scale }% \else\def\psk@swapaxes{}% - \fi} + \fi +} \psset[pstricks]{swapaxes=false} % \define@boolkey[psset]{pstricks}[]{showpoints}[true]{} @@ -2441,33 +2395,33 @@ \newpsfontdotH{Bpentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)} \newpsfontdot{pentagon*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)} % DG/SR modification begin - Mar. 18, 1997 and Dec. 16, 1999 - Patch 14 -%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{<E0>} -%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{<A8>} +%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{StandardSymL}{<E0>} +%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{<A8>} % D.G. modification begin - Jan. 17, 2000 \newpsfontdotH{diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)} \newpsfontdotH{Bdiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)} \newpsfontdot{diamond*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)} % DG/SR modification end -\newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{Symbol}{<C5>} -\newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{Symbol}{<C4>} -\newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{Symbol}{<B4>} -\newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{Times-Roman}{<2B>} -\newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{Times-Roman}{<2A>} -\newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{Times-Bold}{<2B>} -\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{Times-Bold}{<2A>} -\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)} +\newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{<C5>} +\newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{<C4>} +\newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{<B4>} +\newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{NimbusRomNo9L-Regu}{<2B>} +\newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{NimbusRomNo9L-Regu}{<2A>} +\newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{NimbusRomNo9L-Bold}{<2B>} +\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{NimbusRomNo9L-Bold}{<2A>} +\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{NimbusSanL-Regu}{(|)} % DG/SR modification begin - Oct. 27, 1997 - Patch 7 -%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{Helvetica}{(|)} +%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{NimbusSanL-Regu}{(|)} % DG/SR modification end -\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}% +\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{NimbusSanL-Bold}{(|)}% % DG/SR modification begin - Oct. 27, 1997 - Patch 7 -%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{Helvetica-Bold}{(|)} +%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{NimbusSanL-Bold}{(|)} % DG/SR modification end \iffalse -\newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{Symbol}{<B7>} -\newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{Symbol}{<B0>} -\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{Times-Bold}{<CA>} +\newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{StandardSymL}{<B7>} +\newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{StandardSymL}{<B0>} +\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{NimbusRomNo9L-Bold}{<CA>} \fi % Etienne Riga \newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)} @@ -2847,8 +2801,12 @@ \pst@cntg=#1\relax\edef\psk@subgriddiv{\the\pst@cntg}} \psset[pstricks]{subgriddiv=5} % -\define@key[psset]{pstricks}{gridfont}[Helvetica]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 -\psset[pstricks]{gridfont=Helvetica} +\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 +\ifpst@psfonts + \psset[pstricks]{gridfont=Helvetica}% +\else + \psset[pstricks]{gridfont=NimbusSanL-Regu}% +\fi % \define@key[psset]{pstricks}{gridlabels}[10pt]{\pst@getlength{#1}\psk@gridlabels} \psset[pstricks]{gridlabels=10pt} diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls index 15f71fd95b5..f0a84e5347e 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 444 2017-04-19 10:55:35Z herbert $ +% $Id: pst-doc.cls 533 2017-08-24 14:56:30Z herbert $ % %% %% The PSTricks Project @@ -26,8 +26,8 @@ \RequirePackage{amsmath, amssymb} \ifxetex \usepackage{unicode-math} - \usepackage{libertinus} - \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{Anonymous Pro} + \usepackage{libertinus-otf} + \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{DejaVu Sans Mono} \setmathfont{XITS Math} \else \RequirePackage[T1]{fontenc} @@ -35,6 +35,7 @@ %\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} @@ -102,6 +103,7 @@ \RequirePackage{subfig} \RequirePackage{setspace} \RequirePackage{paralist} +\RequirePackage{biblatex} % \RequirePackage{fancyvrb} \newenvironment{Xverbatim}[2][]% diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty deleted file mode 100644 index a1bde247b6b..00000000000 --- a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty +++ /dev/null @@ -1,142 +0,0 @@ -% $Id: pst-platform.sty 446 2017-04-19 11:40:55Z herbert $ -%% -%% This is file `pst-platform.sty', -%% -%% Copyright (C) 2017 Herbert Voß <hvoss@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@file{\jobname.w18} -\newif\if@ip@nix@ -\ifnum\pdf@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@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@nix@true") - elseif os.type == "windows" then - tex.sprint("windowstrue") - end - }\endcsname -\else - \IfFileExists{nul:}{\@ip@nix@false}{\@ip@nix@true} - \IfFileExists{/dev/null}{\windowsfalse}{\windowstrue} - \edef\ip@windows@echo@test{echo \string# > "\ip@file"} - \def\ip@backupplan{% - \IfFileExists{\ip@file}{% - \PackageWarningNoLine{ifplatform}{^^J \space\space\space - Please delete the file "\ip@file" and try again% - }% - \ip@cantdecide - }{% - \ShellEscape{\ip@windows@echo@test}% - \IfFileExists{\ip@file}{% - \ShellEscape{del "\ip@file"}% - \windowstrue - }{% - \@ip@nix@true - }% - }% - } - \ifwindows - \if@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@ip@nix@\else - \ifshellescape - \ip@backupplan - \else - \ip@cantdecide - \fi - \fi - \fi - \fi - \def\ip@only@six#1#2#3#4#5#6#7\@nil{#1#2#3#4#5#6} - \if@ip@nix@ - \ifshellescape - \ifwindows\else - \ShellEscape{uname -s > "\ip@file"} - \CatchFileDef\@tempa{\ip@file}{} - \ShellEscape{rm -- "\ip@file"} - \edef\@tempa{\expandafter\zap@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@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'. diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty deleted file mode 100644 index c363a62f801..00000000000 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty +++ /dev/null @@ -1,179 +0,0 @@ -% $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@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@app@off@ -\newif\if@app@crop@ -\newcounter{app@runs} -\def\app@suffix{autopp} -\edef\app@jobname{\jobname-\app@suffix} -\edef\app@pics{\jobname-pics.pdf} - -%%% -% the following code is adapted from auto-pst-pdf -%%% -\DeclareOptionX{off}[]{\@app@off@true} -\define@choicekey{pstricks-pdf.sty}{crop}[\@tempa\@tempb]{on,off}{% - \ifcase\@tempb\relax - \@app@crop@true - \or - \@app@crop@false - \fi} -\DeclareOptionX{on}[]{\@app@off@false} -\DeclareOptionX{ext}{\def\app@ext{#1}} -\DeclareOptionX{latex}{% - \def\app@latex@opts{% - \ifwindows - -disable-write18 - \else - -no-shell-escape - \fi - -jobname="\app@jobname" - -interaction=batchmode - #1}} -\DeclareOptionX{dvips}{\def\app@dvips@opts{#1}} -\DeclareOptionX{pspdf}{\def\app@pspdf@opts{#1}} -\def\app@pdfcrop@opts{--hres}%%% hv 20130405 -\DeclareOptionX{pdfcrop}{\def\app@pdfcrop@opts{#1}} - -\DeclareOptionX{cleanup}{% - \let\app@rm@files\@empty - \@for\@ii:=#1\do{% - \edef\app@rm@files{\app@rm@files,\app@jobname.\@ii}}} - -\DeclareOptionX{runs}{% - \setcounter{app@runs}{#1}% support calc - \ifnum\c@app@runs > \z@ - \else - \app@PackageWarning{The number of runs must be at least one.}% - \c@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@off@true\fi -% -\def\app@nl{^^J\space\space\space\space} -\newcommand\app@PackageError[2]{\PackageError{pstricks-pdf}{\app@nl #1^^J}{#2}} -\newcommand\app@PackageWarning[1]{% - \PackageWarning{pstricks-pdf}{\app@nl #1^^JThis warning occured}} -\newcommand\app@PackageInfo[1]{\PackageInfo{pstricks-pdf}{#1}} -\newcommand\OnlyIfFileExists[2]{\IfFileExists{#1}{#2}{}} -\newcommand\NotIfFileExists[2]{\IfFileExists{#1}{}{#2}} -\def\app@convert#1#2#3{% - \OnlyIfFileExists{#2}{% -% \expandafter\typeout\expandafter{\csname app@cmd@#1\endcsname}% - \typeout{filenameIN: #2}% - \typeout{filenameOUT: #3}% - \ShellEscape{\csname app@cmd@#1\endcsname{#2}{#3}}% - \NotIfFileExists{#3}{\app@PackageWarning{Creation of #3 failed.}}}} -\def\app@compile{% - \app@cleanup - \app@remove@container - \loop\ifnum\c@app@runs > \@ne - \app@convert{extralatex}{\jobname.\app@ext}{}% - \advance\c@app@runs\m@ne - \repeat - \app@convert{latex}{\jobname.\app@ext}{}% - \ifxetex\else - \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}% - \fi - \if@app@crop@ - \ifxetex\else - \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}% - \fi - \app@convert{pdfcrop}{\app@jobname.pdf}{\app@pics}% - \else - \ifxetex\else - \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}% - \fi - \fi - \IfFileExists{\app@pics} - {\app@cleanup} - {\app@PackageWarning{Could not create \app@pics. - Auxiliary files not deleted.}}} -\edef\app@rm{\ifwindows del \else rm -- \fi} -\newcommand\app@try@rm[1]{% - \@for\@tempa:=#1\do{% - \OnlyIfFileExists{\@tempa}{\ShellEscape{\app@rm "\@tempa"}}}} -\def\app@remove@container{\app@try@rm{\app@pics}} -\def\app@cleanup{\app@try@rm{\app@rm@files}} -\ifluatex -% \def\app@cmd@latex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"} -% \def\app@cmd@extralatex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"} - \def\app@cmd@latex#1#2{xelatex \app@latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\empty\input} #1"} - \def\app@cmd@extralatex#1#2{xelatex \app@latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\undefined\input} #1"} -\else - \def\app@cmd@latex#1#2{latex \app@latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"} - \def\app@cmd@extralatex#1#2{\@app@prog\space \app@latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"} - \def\app@cmd@dvips#1#2{dvips \app@dvips@opts\space -o "#2" "#1"} - \def\app@cmd@pstopdf#1#2{ps2pdf \app@pspdf@opts\space "#1" "#2"} -\fi -\def\app@cmd@pdfcrop#1#2{pdfcrop \app@pdfcrop@opts\space "#1" "#2"} -\ifpdf - \if@app@off@\else - \ShellEscape{echo " "} - \ShellEscape{echo "-------------------------------------------------"} - \ShellEscape{echo "pstricks-pdf: Auxiliary LaTeX compilation"} - \ShellEscape{echo "-------------------------------------------------"} - \app@compile - \ShellEscape{echo "-------------------------------------------------"} - \ShellEscape{echo "pstricks-pdf: End auxiliary LaTeX compilation"} - \ShellEscape{echo "-------------------------------------------------"} - \fi - \if@app@crop@ - \PassOptionsToPackage{notightpage}{pst-pdf} - \fi -\else - \ifx\APPmakepictures\@undefined - \PassOptionsToPackage{inactive}{pst-pdf} - \else - \if@app@crop@ - \PassOptionsToPackage{notightpage}{pst-pdf} - \fi - \fi -\fi -\RequirePackage{pst-pdf} -\RequirePackage{pstricks} -\@ifclassloaded{beamer}{\setbeamertemplate{navigation symbols}}{}% -% -\let\app@ig\includegraphics -% -%% -%% End of file `pstricks-pdf.sty'. diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 6d2703b2ba8..571c7c06979 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 446 2017-04-19 11:40:55Z herbert $ +% $Id: pstricks.sty 616 2017-10-04 16:14:42Z herbert $ %% %% This is file `pstricks.sty'. %% @@ -17,7 +17,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pstricks}[2017/03/17 v0.63 LaTeX wrapper for `PSTricks' (RN,HV)] +\ProvidesPackage{pstricks}[2017/09/17 v0.65 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -40,7 +40,9 @@ %---------------------------------DISTILLER -------------------------------- \newif\ifpst@distiller\pst@distillerfalse \DeclareOption{distiller}{\pst@distillertrue} - +% +\newif\ifpst@psfonts \pst@psfontsfalse +\DeclareOption{psfonts}{\pst@psfontstrue} %---------------------------------COLOR -------------------------------- \DeclareOption{monochrome}{% \AtBeginDocument{\special{ps: @@ -65,18 +67,29 @@ \DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}} \ProcessOptions\relax +\RequirePackage{iftex} +\RequirePackage{shellesc} +%\ifPDFTeX +% \ifpdfshellescape\else +% \@latex@error +% {You are running `\jobname.tex' with pdflatex and without option `--shell-escape' ,\MessageBreak +% you need package auto-pst-pdf and that option!}% +% {Alternatively use xelatex or latex->dvips->ps2pdf} +% \fi +%\fi \RequirePackage{\pst@ColorPackage} % \@ifundefined{PSTricksLoaded} {% \let\saved@scalebox\scalebox + \input{pst-xkey}% \input{pstricks}% \ProvidesFile{pstricks.tex}[\filedate\space v\fileversion\space `PSTricks' (tvz,hv)] - \input{pst-fp.tex} + \input{pst-fp.tex}% \ProvidesFile{pst-fp.tex}[\filedate\space v\fileversion\space `PST-fp' (hv)] \IfFileExists{pstricks.pro}{% \ProvidesFile{pstricks.pro} - [2012/10/16 v. 1.15, PostScript prologue file (hv)] + [2017/09/18 v. 1.27, PostScript prologue file (hv)] \@addtofilelist{pstricks.pro}}{}% \IfFileExists{pst-algparser.pro}{% \ProvidesFile{pst-algparser.pro}[2011/10/31 v. 0.04, PostScript prologue file (hv)] @@ -97,25 +110,29 @@ [ /ca \psk@strokeopacityalpha /CA \psk@strokeopacityalpha /SetTransparency pdfmark > \pst@def{setBlendmode}< - [ /BM\ifcase\psk@blendmode% - /Normal \or % 0 - /Multiply \or % 1 - /Screen \or % 2 - /Overlay \or % 3 - /Darken \or % 4 - /Lighten \or % 5 - /ColorDodge \or % 6 - /ColorBurn \or % 7 - /HardLight \or % 8 - /SoftLight \or % 9 - /Difference \or % 10 - /Exclusion \or % 11 - /Hue \or % 12 - /Color \or % 13 - /Saturation \or % 14 - /Luminosity % 15 - \else /Normal \fi - /ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark >% + [ /BM% + \ifcase\psk@blendmode + /Normal \or + /Compatible \or + /Screen \or + /Multiply \or + /HardLight \or + /Darken \or + /Lighten \or + /Difference \or + /ColorDodge \or + /ColorBurn \or + /SoftLight \or + /Hue \or + /Saturation \or + /Luminosity \or + /Overlay \or + /Exclusion \or + /Color + \else + /Normal + \fi + /ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark > \fi % \@ifpackageloaded{xcolor}{% |