diff options
17 files changed, 315 insertions, 370 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/pst-pdf/ps4pdf b/Build/source/texk/texlive/linked_scripts/pst-pdf/ps4pdf index 621d3b71ad8..33ae7428350 100755 --- a/Build/source/texk/texlive/linked_scripts/pst-pdf/ps4pdf +++ b/Build/source/texk/texlive/linked_scripts/pst-pdf/ps4pdf @@ -9,6 +9,9 @@ # 2006-07-14: Better temp dir handling (suggested by Karl Berry) (RN). # 2006-07-23: New option --Xps2pdf and code cleanup (thanks to Karl Berry) (RN). # 2008-08-04: Remove the parameter "-Ppdf" from the dvips call (RN). +# 2016-07-02: New option "--xelatex", (hv) +# "--lualatex" , (hv) +# 2016-07-11: Better tests if xelatex or lualatex (RN) # First, work around bugs/limitations in some shells on some systems: test -f /bin/sh5 && test -z "$RUNNING_SH5" \ @@ -84,6 +87,14 @@ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/.$progname$$ log=$tmpdir/log version="1.0" +## the defaults +ENGINE1=latex +OPTIONS= +ENGINE2=pdflatex +DVIPS=dvips +PS2PDF=ps2pdf +FILE=$1 + # look for optional things first while case $1 in @@ -93,8 +104,17 @@ while echo "--Xps2pdf OPT passes OPT to ps2pdf." echo " (-dAutoRotatePages=/None is always passed.)" echo "--crop runs pdfcrop on ps2pdf output." - exit 0;; + echo "--lualatex using the luatex engine for .dvi and .pdf" + echo "--xelatex using the xetex engine for .xdv and .pdf" + exit 0;; --version) echo "$progname version $version"; exit 0;; + --lualatex) ENGINE1=lualatex; + OPTIONS="--output-format=dvi"; + ENGINE2=lualatex; FILE=$2;; + --xelatex) ENGINE1=xelatex; + OPTIONS="-no-pdf"; + ENGINE2=xelatex; + DVIPS=xdvipdfmx; FILE=$2;; --crop|-c) crop=true;; --Xps2pdf|-Xps2pdf) shift; ps2pdf_opts="$ps2pdf_opts $1";; -q) silent=true;; @@ -107,8 +127,7 @@ do done # remaining option: filename -file=$1 -if test -z "$file"; then +if test -z "$FILE"; then echo "$0: no file to process, try --help for more information." >&2 exit 1 fi @@ -118,17 +137,21 @@ fi job=`echo "x$1" | sed 's@x@@; s@.*/@@; s@\.[^.]*$@@'` setupTmpDir -myexec latex \ - "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}" -test -f "$job.dvi" && myexec dvips -o "$job-pics.ps" "$job.dvi" -test -f "$job-pics.ps" && myexec ps2pdf \ - "$ps2pdf_opts" "$job-pics.ps" "$job-pics.pdf" +myexec ${ENGINE1} ${OPTIONS} "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$FILE}" + +if test "$ENGINE1" = "latex" || test "$ENGINE1" = "lualatex"; then + myexec ${DVIPS} -o "$job-pics.ps" "$job.dvi" +else + myexec ${DVIPS} -o "$job-pics.pdf" "$job.xdv" +fi + +test -f "$job-pics.ps" && myexec ${PS2PDF} "$ps2pdf_opts" "$job-pics.ps" "$job-pics.pdf" + if $crop; then myexec pdfcrop "$job-pics.pdf" "$job-pics-crop.pdf" mv "$job-pics-crop.pdf" "$job-pics.pdf" fi -myexec pdflatex \ - "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}" +myexec ${ENGINE2} "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$FILE}" true cleanup diff --git a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES index f026a29e858..b6f36d7b494 100644 --- a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES +++ b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES @@ -5,23 +5,23 @@ v1.0a v1.0b General: Some code and documentation cleaning. (RN) v1.0c - General: New options "pstricks", "nopstricks", "draft" and - "final". (RN) + General: New options “pstricks”, “nopstricks”, “draft” and + “final”. (RN) v1.0d General: Redefinition of \includegraphics in modes 0 und 1. Now using of eps graphics directly in pdfLaTeX is possible. (RN) v1.0e - postscript: "trim" option added. (RN) + postscript: “trim” option added. (RN) v1.0f - General: Config file loading added. (RN) \savepicture: New macro \savepspicture. (RN) \usepicture: New macro \usepspicture. Useful for putting a PSTricks graphic in a box or something else. (RN) + General: Config file loading added. (RN) v1.0g - General: Definition of \PDFcontainer now with \edef. (RN) \usepicture: Now \usepspicture does accept a numerical parameter. (RN) + General: Definition of \PDFcontainer now with \edef. (RN) v1.0h psmatrix: Based no more on the comment environment from the verbatim package. (RN) @@ -29,23 +29,23 @@ v1.0i \ppf@is@pdfTeX@graphic: No more errors for given files without extensions. (RN) v1.0j - General: Check AtBeginDocument for package `pstricks' even if - "nopstricks" is given. (RN) + General: Check AtBeginDocument for package ‘pstricks’ even if + “nopstricks” is given. (RN) v1.0k \Gin@setfile: Show also the pagenumber if exists. (RN) \Ginclude@graphics: Prevent division by zero. (RN) v1.0l - General: Options "framesep", "framerule", "linewidth" removed, - "fname" and "innerframe" added. (RN) + General: Options “framesep”, “framerule”, “linewidth” removed, + “fname” and “innerframe” added. (RN) v1.0m - General: New package option "notightpage" added. (RN) + General: New package option “notightpage” added. (RN) v1.0n General: Changed marcro names (\savepicture and \usepicture). (RN) Some code cleaning. (RN) v1.0o - General: New code for "notightpage". (RN) - Option "fname" renamed to "showname". (RN) + General: New code for “notightpage”. (RN) + Option “fname” renamed to “showname”. (RN) v1.0p General: Some code and documentation cleaning. (RN) v1.0q @@ -56,9 +56,9 @@ v1.0r \ppf@is@pdfTeX@graphic. Now pdfTEX graphics are prefered. (RN) v1.0s + \Gin@ii: Rewritten. (RN) General: Scaling e.g. of PostScript pictures now only in extraction mode. Some code cleaning. (RN) - \Gin@ii: Rewritten. (RN) v1.1a General: Support for the internal PSTricks macro \pst@object. (HjG/RN) @@ -66,21 +66,21 @@ v1.1b General: Ignore the call of \nofiles inside of preview. (RN) Some code and documentation cleaning. (RN) v1.1c - General: New package option "tightpage" added. (RN) - Special support for "tabularx". (RN) + General: New package option “tightpage” added. (RN) + Special support for “tabularx”. (RN) Supress handling of pdfLaTeX graphic formats in DVI mode. (RN) v1.1d - postscript: Support for PSTricks environment "psmatrix". (RN) + postscript: Support for PSTricks environment “psmatrix”. (RN) v1.1e - General: New option "displaymath" (see preview package). + General: New option “displaymath” (see preview package). (HjG/RN) v1.1f - General: Package option "ignore" reimplemented. Now the + General: Package option “ignore” reimplemented. Now the compilation of the dtx file in LaTeX mode is possible. (RN) v1.1g - postscript: "psmatrix" environment (preserve math mode). + postscript: “psmatrix” environment (preserve math mode). (RN/HjG) pspicture: pspicture environment must still parse its arguments. (RN/HjG) @@ -88,15 +88,15 @@ v1.1h \Ginclude@graphics: Check if inside of a PS-related environment (correct graphic inclusion). (RN) v1.1i - General: \ifpr@outer must be predefined. (HjG/RN) - Package option "final" also for "graphicx". (RN) \Ginclude@graphics: Correction of the inside check. (RN/HjG) + General: \ifpr@outer must be predefined. (HjG/RN) + Package option “final” also for “graphicx”. (RN) v1.1k General: New environment pst-pdf-defs: Support for PSTricks - environment "psmatrix" inside user definitions. + environment “psmatrix” inside user definitions. (RN,HjG) v1.1l - General: Support for the package "psfragx". (RN) + General: Support for the package “psfragx”. (RN) v1.1m General: Merge english and german version of the documentation. (RN) @@ -106,12 +106,12 @@ v1.1o \Gscale@@box: Disable scaling. (RN) v1.1p General: \nofiles makes \makeindex and \makeglossary to \relax. - \@empty is better because of later \renewcommand's. + \@empty is better because of later \renewcommand’s. v1.1p1 - General: \let\output\@gobble before loading of "preview" added. + General: \let\output\@gobble before loading of “preview” added. (RN) v1.1q - General: Problem with "tabularx" and "threeparttabel" solved. + General: Problem with “tabularx” and “threeparttabel” solved. (RN) v1.1r General: Fixed values for \PreviewBbAdjust because \paperwidth @@ -119,13 +119,15 @@ v1.1r v1.1s General: Dummy definition of the page key in DVI mode. v1.1t - General: Remove the line "\let\output\@gobble" because of bad + General: Remove the line “\let\output\@gobble” because of bad side effects. (RN) postscript: Using environ the environment postscript is now simple and more robust. (RN) v1.1u - General: \pdfoutput must be set when loading "pdftex.def" in DVI + General: \pdfoutput must be set when loading “pdftex.def” in DVI mode. (RN) v1.1v - General: Local redefinition of \pdfoutput to be a counter. (RN) \Gin@ii: Key settings only for pdf graphics. (RN) + General: Local redefinition of \pdfoutput to be a counter. (RN) +v1.2a + General: Engine tests changed (RN) diff --git a/Master/texmf-dist/doc/latex/pst-pdf/Makefile b/Master/texmf-dist/doc/latex/pst-pdf/Makefile new file mode 100644 index 00000000000..1e72ef57e3d --- /dev/null +++ b/Master/texmf-dist/doc/latex/pst-pdf/Makefile @@ -0,0 +1,128 @@ + +# `pst-pdf' -- Rolf Niepraschk, 2008-02-24, Rolf.Niepraschk@ptb.de + + +.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps + +PACKAGE = pst-pdf + +PDFLATEX = pdflatex + +LATEX = latex + +ARCHNAME = $(PACKAGE)-$(shell date +"%Y%m%d") +ARCHNAME_TDS = $(PACKAGE).tds + +EXAMPLE = $(PACKAGE)-example.tex + +ADDINPUTS = penguin.eps elephant.ps knuth.png psf-demo.eps \ + insect1.eps insect15.eps + +PDF_CONTAINER = $(EXAMPLE:.tex=-pics.pdf) + +ARCHFILES = $(PACKAGE).dtx $(PACKAGE).ins $(ADDINPUTS) Makefile \ + README.md CHANGES CHANGES.tex \ + $(PACKAGE).pdf $(PACKAGE)-DE.pdf $(EXAMPLE:.tex=.pdf) \ + ps4pdf \ + ps4pdf.bat \ + ps4pdf.bat.noMiKTeX \ + ps4pdf.bat.w95 \ + +PS2PDF = GS_OPTIONS=-dPDFSETTINGS=/prepress ps2pdf + +all : pdf doc example + +pdf : $(EXAMPLE:.tex=.pdf) + +doc : $(PACKAGE).pdf + +doc-DE : $(PACKAGE)-DE.pdf + +example : $(EXAMPLE:.tex=.pdf) + +$(EXAMPLE:.tex=.pdf) : $(EXAMPLE) $(ADDINPUTS) $(PDF_CONTAINER) $(PACKAGE).sty + $(PDFLATEX) $< + +dist : doc doc-DE pdf example + tar cvzf $(ARCHNAME).tar.gz $(ARCHFILES) + @ echo + @ echo $(ARCHNAME).tar.gz + +%.gls %.pdf : %.dtx $(PACKAGE).sty + test -f $(basename $<).glo || touch -f $(basename $<).glo + test -f $(basename $<).idx || touch -f $(basename $<).idx + makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ + $(basename $<).glo + makeindex -s gind.ist -t $(basename $<).ilg -o $(basename $<).ind \ + $(basename $<).idx + $(PDFLATEX) $< + +$(PACKAGE)-DE.gls $(PACKAGE)-DE.pdf : $(PACKAGE).dtx $(PACKAGE).sty + test -f $(basename $@).glo || touch -f $(basename $@).glo + test -f $(basename $@).idx || touch -f $(basename $@).idx + makeindex -s gglo.ist -t $(basename $@).glg -o $(basename $@).gls \ + $(basename $@).glo + makeindex -s gind.ist -t $(basename $@).ilg -o $(basename $@).ind \ + $(basename $@).idx + cp $< $(basename $@).dtx + $(PDFLATEX) '\newcommand*{\mainlang}{ngerman}\input{$(basename $@).dtx}' + $(RM) $(basename $@).dtx + +%.pdf : %.tex + $(PDFLATEX) $< + +$(PACKAGE).sty $(EXAMPLE) : $(PACKAGE).ins $(PACKAGE).dtx + tex $< + +$(EXAMPLE:.tex=.dvi) : $(EXAMPLE) $(ADDINPUTS) $(PACKAGE).sty + $(LATEX) $< + +$(PDF_CONTAINER:.pdf=.ps) : $(EXAMPLE:.tex=.dvi) + dvips -Ppdf -o $@ $< + +$(PDF_CONTAINER) : $(PDF_CONTAINER:.pdf=.ps) + @ if grep "needs cropping" $(<:-pics.ps=.log) > /dev/null; \ + then \ + $(PS2PDF) $< $@.tmp; pdfcrop $@.tmp $@ ; rm $@.tmp; \ + else \ + $(PS2PDF) $< $@; \ + fi + +CHANGES : CHANGES.pdf + pdftotext -enc UTF-8 -layout -nopgbrk $< $@ + +CHANGES.pdf : CHANGES.tex $(PACKAGE).gls + $(PDFLATEX) $< + +arch : CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf + zip $(ARCHNAME).zip $(ARCHFILES) + +arch-tds : CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf + $(RM) $(ARCHNAME_TDS).zip + mkdir -p tds/tex/latex/pst-pdf + mkdir -p tds/doc/latex/pst-pdf + mkdir -p tds/source/latex/pst-pdf + mkdir -p tds/scripts/pst-pdf + cp pst-pdf.sty tds/tex/latex/pst-pdf/ + cp CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf \ + README.md tds/doc/latex/pst-pdf/ + cp CHANGES.tex elephant.ps insect1.eps insect15.eps \ + knuth.png penguin.eps psf-demo.eps pst-pdf.dtx \ + pst-pdf.ins tds/source/latex/pst-pdf + cp ps4pdf ps4pdf.bat ps4pdf.bat.noMiKTeX \ + ps4pdf.bat.w95 tds/scripts/pst-pdf/ + cd tds ; zip -r ../$(ARCHNAME_TDS).zip tex doc source scripts + rm -rf tds + + +clean : + $(RM) $(addprefix $(PACKAGE), \ + .dvi .log .aux .bbl .blg .idx .ind .ilg .gls .glg .glo) \ + $(addprefix $(basename $(EXAMPLE)), .ps .dvi .log .aux) \ + $(EXAMPLE) $(PDF_CONTAINER:.pdf=.ps) $(PDF_CONTAINER) \ + CHANGES.pdf + +veryclean : clean + $(RM) $(PACKAGE).pdf pst-pdf-DE.pdf $(EXAMPLE:.tex=.pdf) CHANGES + +# EOF diff --git a/Master/texmf-dist/doc/latex/pst-pdf/README b/Master/texmf-dist/doc/latex/pst-pdf/README deleted file mode 100644 index e4d9e2fb316..00000000000 --- a/Master/texmf-dist/doc/latex/pst-pdf/README +++ /dev/null @@ -1,26 +0,0 @@ - -pst-pdf.sty - -A LaTeX package to integrate PostScript code into a PDF output. -Load the testfile pst-pdf-example.tex and run it with the shell script - -ps4pdf pst-pdf-example.tex - -it produces the output file pst-pdf-example.pdf. Be sure that the script is -executable. - -pst-pdf.sty -> $TEXMF-LOCAL -ps4pdf -> /usr/local/bin - the shell script for running latex->dvips->ps2pdf->pdflatex - - -without a shell script, run - -latex <file> -dvips -Ppdf -o <file>-pics.ps <file>.dvi -ps2pdf -dAutoRotatePages=/None <file>-pics.ps <file>-pics.pdf -pdflatex <file> - - Rolf Niepraschk, 2006-07-23 - - diff --git a/Master/texmf-dist/doc/latex/pst-pdf/README.md b/Master/texmf-dist/doc/latex/pst-pdf/README.md new file mode 100644 index 00000000000..f9150ab1671 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pst-pdf/README.md @@ -0,0 +1,24 @@ +# pst-pdf + +A LaTeX package to integrate PostScript code into a PDF output. +Load the testfiles pst-pdf-example?.tex and run it with the shell script +``` +ps4pdf pst-pdf-example.tex +``` +It produces the output file pst-pdf-example.pdf. Be sure that the script is +executable. +``` +pst-pdf.sty -> $TEXMF-LOCAL +ps4pdf -> /usr/local/bin +``` +Without a shell script, run +``` +latex <file> +dvips -Ppdf -o <file>-pics.ps <file>.dvi +ps2pdf -dAutoRotatePages=/None <file>-pics.ps <file>-pics.pdf +pdflatex <file> +``` +For bug reports: https://github.com/rolfn/pst-pdf/issues + +Rolf Niepraschk, 2016-06-23 + diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf Binary files differindex d8f280840ea..beb9eafee7b 100644 --- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf +++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf Binary files differnew file mode 100644 index 00000000000..0e2ce00e6a1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.tex b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.tex index 1cfe003f77c..dbcbae5ba7c 100644 --- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.tex +++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.tex @@ -1,10 +1,10 @@ %% -%% This is file `pst-pdf-example2.tex', +%% This is file `pst-pdf-example.tex', %% generated with the docstrip utility. %% %% The original source files were: %% -%% pst-pdf.dtx (with options: `example2') +%% pst-pdf.dtx (with options: `example') %% %% This is a generated file. %% @@ -23,10 +23,10 @@ %% %% Process this file with the scripts `ps4pdf' or `ps4pdf.bat' or call %% -%% latex pst-pdf-example2.tex -%% dvips -Ppdf -o pst-pdf-example2-pics.ps pst-pdf-example2.dvi -%% ps2pdf -dAutoRotatePages=/None pst-pdf-example2-pics.ps pst-pdf-example2-pics.pdf -%% pdflatex pst-pdf-example2.tex +%% latex pst-pdf-example.tex +%% dvips -Ppdf -o pst-pdf-example-pics.ps pst-pdf-example.dvi +%% ps2pdf -dAutoRotatePages=/None pst-pdf-example-pics.ps pst-pdf-example-pics.pdf +%% pdflatex pst-pdf-example.tex %% \listfiles\errorcontextlines=100\relax \documentclass[12pt]{article} @@ -276,4 +276,4 @@ \end{document} \endinput %% -%% End of file `pst-pdf-example2.tex'. +%% End of file `pst-pdf-example.tex'. diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf Binary files differdeleted file mode 100644 index 1c11131e2c7..00000000000 --- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.tex b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.tex deleted file mode 100644 index 11cb6cd16f3..00000000000 --- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.tex +++ /dev/null @@ -1,129 +0,0 @@ -%% -%% This is file `pst-pdf-example1.tex', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% pst-pdf.dtx (with options: `example1') -%% -%% This is a generated file. -%% -%% Copyright (C) 2004-2008 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de> -%% and Hubert Gaesslein -%% -%% This file may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX version -%% 1999/12/01 or later. -%% -%% Process this file with the scripts `ps4pdf' or `ps4pdf.bat' or call -%% -%% latex pst-pdf-example1.tex -%% dvips -Ppdf -o pst-pdf-example1-pics.ps pst-pdf-example1.dvi -%% ps2pdf -dAutoRotatePages=/None pst-pdf-example1-pics.ps pst-pdf-example1-pics.pdf -%% pdflatex pst-pdf-example1.tex -%% -\listfiles -\documentclass[12pt,a4paper]{article} -\usepackage[margin={25mm,30mm}]{geometry} - -\usepackage[dvipsnames]{pstricks} -\usepackage{pst-node,pst-tree,psfrag} -\usepackage{pst-pdf} - -\pagestyle{empty} - -\begin{document} - -\section*{\textsf{pst-pdf:} A short example document} - -\subsection*{png graphic and postscript graphic together} - -\noindent\includegraphics[width=.35\textwidth]{knuth}% A none-ps graphic -\hfill -\includegraphics[width=.60\textwidth]{elephant}% A ps graphic - -\subsection*{PSTricks code inside a pspicture environment} - -\newpsobject{showgrid}{psgrid}{subgriddiv=1,griddots=10,gridlabels=8pt} - -\begin{center} -\begin{pspicture}(-5.25,-5.25)(5.25,5.25)% - \pscircle*[linecolor=Apricot]{5} - \rput(0,0.5){\includegraphics[width=8\psxunit]{elephant}} - \Huge\sffamily\bfseries - \rput(-4.5,4.5){A} \rput(4.5,4.5){B} - \rput(-4.5,-4.5){C}\rput(4.5,-4.5){D} - \rmfamily - \rput(0,-3.8){PSTricks} - \rput(0,3.8){\LaTeX} - \showgrid -\end{pspicture} -\end{center} - -\subsection*{PSTricks code without a pspicture environment} - -%%---------------------------------------------------------------------- -%% From: The \LaTeX\ Graphics Companion; first release. -\definecolor{pink}{rgb}{1, .75, .8} -\renewcommand\psedge{\nccurve} -\newcommand{\Female}[2][]{{\psset{linecolor=pink}\TR[#1]{\emph{#2}}}} -\newcommand{\Male}[2][]{{\psset{linecolor=blue}\TR[#1]{#2}}} -\psset{nodesep=2pt,angleA=90,angleB=-90} -\footnotesize - -\pstree[treemode=U]{\Female{{\bfseries Matilde}}}{% - \pstree{\Male{Sebastian}}{% - \pstree{\Male[name=P]{Philip}}{\Male{Frederick}\Female{Ethel}} - \pstree{\Female[name=W]{Mary}}{\Male{Lionel}\Female{Agnes}}} - \pstree{\Female{Leonor}}{% - \pstree{\Male[name=R]{Ra\'ul}}{\Male{Joaquim}\Female{J\'ulia}} - \pstree{\Female[name=A]{Am\'elia}}{\Male{\'Alvaro}\Female{Augusta}}} -} - -%%---------------------------------------------------------------------- - -\subsection*{psfrag demo} - -\normalsize - -\noindent -\includegraphics[width=.475\textwidth]{psf-demo.eps} -\hfill -\begin{psfrags} - \psfragscanon - \psfrag{x1}[br][ ]{\LaTeX} \psfrag{x2}[br][br]{\LaTeX} - \psfrag{x3}[br][tl]{\LaTeX} \psfrag{x4}[br][Br]{\LaTeX} - \psfrag{x5}[Br][ r][1.15][45]{\Huge\LaTeX} - \psfrag{x6}[tl][ l][1.15][45]{\Huge\LaTeX} - \includegraphics[width=.475\textwidth]{psf-demo} -\end{psfrags} - -\subsection*{The postscript environment} - -\begin{center} -\begin{postscript} -\Large -\noindent -$ - \bordermatrix{% - & A & B & C\cr - & \rnode{D}{D} & E & \rnode{F}{F}\cr - & G & H & I\cr - & \rnode{J}{J} & K & M - } -$ -\ncline[nodesep=-1em,linecolor=red]{D}{F} -\ncline[nodesep=-1em,linecolor=red]{D}{J} -\end{postscript} -\end{center} - -\end{document} -\endinput -%% -%% End of file `pst-pdf-example1.tex'. diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf Binary files differdeleted file mode 100644 index 40cb0f6888c..00000000000 --- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf Binary files differindex 87e0631ffc3..d8c341aedc2 100644 --- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf +++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf diff --git a/Master/texmf-dist/scripts/pst-pdf/ps4pdf b/Master/texmf-dist/scripts/pst-pdf/ps4pdf index 621d3b71ad8..33ae7428350 100755 --- a/Master/texmf-dist/scripts/pst-pdf/ps4pdf +++ b/Master/texmf-dist/scripts/pst-pdf/ps4pdf @@ -9,6 +9,9 @@ # 2006-07-14: Better temp dir handling (suggested by Karl Berry) (RN). # 2006-07-23: New option --Xps2pdf and code cleanup (thanks to Karl Berry) (RN). # 2008-08-04: Remove the parameter "-Ppdf" from the dvips call (RN). +# 2016-07-02: New option "--xelatex", (hv) +# "--lualatex" , (hv) +# 2016-07-11: Better tests if xelatex or lualatex (RN) # First, work around bugs/limitations in some shells on some systems: test -f /bin/sh5 && test -z "$RUNNING_SH5" \ @@ -84,6 +87,14 @@ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/.$progname$$ log=$tmpdir/log version="1.0" +## the defaults +ENGINE1=latex +OPTIONS= +ENGINE2=pdflatex +DVIPS=dvips +PS2PDF=ps2pdf +FILE=$1 + # look for optional things first while case $1 in @@ -93,8 +104,17 @@ while echo "--Xps2pdf OPT passes OPT to ps2pdf." echo " (-dAutoRotatePages=/None is always passed.)" echo "--crop runs pdfcrop on ps2pdf output." - exit 0;; + echo "--lualatex using the luatex engine for .dvi and .pdf" + echo "--xelatex using the xetex engine for .xdv and .pdf" + exit 0;; --version) echo "$progname version $version"; exit 0;; + --lualatex) ENGINE1=lualatex; + OPTIONS="--output-format=dvi"; + ENGINE2=lualatex; FILE=$2;; + --xelatex) ENGINE1=xelatex; + OPTIONS="-no-pdf"; + ENGINE2=xelatex; + DVIPS=xdvipdfmx; FILE=$2;; --crop|-c) crop=true;; --Xps2pdf|-Xps2pdf) shift; ps2pdf_opts="$ps2pdf_opts $1";; -q) silent=true;; @@ -107,8 +127,7 @@ do done # remaining option: filename -file=$1 -if test -z "$file"; then +if test -z "$FILE"; then echo "$0: no file to process, try --help for more information." >&2 exit 1 fi @@ -118,17 +137,21 @@ fi job=`echo "x$1" | sed 's@x@@; s@.*/@@; s@\.[^.]*$@@'` setupTmpDir -myexec latex \ - "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}" -test -f "$job.dvi" && myexec dvips -o "$job-pics.ps" "$job.dvi" -test -f "$job-pics.ps" && myexec ps2pdf \ - "$ps2pdf_opts" "$job-pics.ps" "$job-pics.pdf" +myexec ${ENGINE1} ${OPTIONS} "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$FILE}" + +if test "$ENGINE1" = "latex" || test "$ENGINE1" = "lualatex"; then + myexec ${DVIPS} -o "$job-pics.ps" "$job.dvi" +else + myexec ${DVIPS} -o "$job-pics.pdf" "$job.xdv" +fi + +test -f "$job-pics.ps" && myexec ${PS2PDF} "$ps2pdf_opts" "$job-pics.ps" "$job-pics.pdf" + if $crop; then myexec pdfcrop "$job-pics.pdf" "$job-pics-crop.pdf" mv "$job-pics-crop.pdf" "$job-pics.pdf" fi -myexec pdflatex \ - "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}" +myexec ${ENGINE2} "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$FILE}" true cleanup diff --git a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx index 269271c1748..8246a03c8a4 100644 --- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx +++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx @@ -1,8 +1,8 @@ % \iffalse meta-comment % -% Copyright (C) 2005-2008 -% Rolf Niepraschk, <Rolf.Niepraschk@gmx.de> -% Hubert Gaesslein +% Copyright (C) +% 2005--2008: Rolf Niepraschk, <Rolf.Niepraschk@gmx.de>, Hubert Gaesslein +% 2008--: Rolf Niepraschk, <Rolf.Niepraschk@gmx.de> % -------------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -24,7 +24,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{pst-pdf} %<*package> - [2008/10/09 v1.1v PS graphics for pdfLaTeX (RN,HjG)] + [2016/07/11 v1.2a PS graphics for pdfLaTeX (RN,HjG)] %</package> % %<*driver> @@ -50,7 +50,7 @@ %</driver> % \fi % -% \CheckSum{836} +% \CheckSum{829} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -637,41 +637,35 @@ % range of functions. This test is only executed when the options |active| % or |inactive| were not given. % \fi +% \changes{v1.2a}{2016/07/11}{Engine tests changed (RN)} % \begin{macrocode} \ifnum\ppf@TeX@mode=-1\relax - \begingroup + \RequirePackage{ifpdf,ifxetex,ifvtex}% + \ifpdf % \end{macrocode} -% Default (\TeX{} with a dvi-to-ps converter) +% \quad$\Rightarrow$\,pdf\TeX{} or Lua\TeX{} are running in PDF mode % \begin{macrocode} - \chardef\x=0 % + \def\ppf@TeX@mode{1}% + \RequirePackage{luatex85}% + \else + \ifvtex % \end{macrocode} -% Check pdf\TeX{} +% \quad$\Rightarrow$\,V\TeX{} % \begin{macrocode} - \@ifundefined{pdfoutput}{}{% - \ifcase\pdfoutput\else - \chardef\x=1 % - \fi - }% + \def\ppf@TeX@mode{9}% + \else + \ifxetex % \end{macrocode} -% Check V\TeX{} +% \quad$\Rightarrow$\,Xe\TeX{} % \begin{macrocode} - \@ifundefined{OpMode}{}{\chardef\x=2 }% - \expandafter\endgroup - \ifcase\x + \def\ppf@TeX@mode{9}% + \else % \end{macrocode} % \quad$\Rightarrow$\,DVI mode % \begin{macrocode} - \def\ppf@TeX@mode{0}% - \or -% \end{macrocode} -% \quad$\Rightarrow$\,pdf\TeX{} is running in PDF mode -% \begin{macrocode} - \def\ppf@TeX@mode{1}% - \else -% \end{macrocode} -% \quad$\Rightarrow$\,V\TeX{} is running -% \begin{macrocode} - \def\ppf@TeX@mode{9}% + \def\ppf@TeX@mode{0}% + \fi + \fi \fi \fi % \end{macrocode} @@ -1754,118 +1748,13 @@ %\endinput % % And here comes the example documents ... -%<*example1> -%% Process this file with the scripts `ps4pdf' or `ps4pdf.bat' or call -%% -%% latex pst-pdf-example1.tex -%% dvips -Ppdf -o pst-pdf-example1-pics.ps pst-pdf-example1.dvi -%% ps2pdf -dAutoRotatePages=/None pst-pdf-example1-pics.ps pst-pdf-example1-pics.pdf -%% pdflatex pst-pdf-example1.tex -%% -\listfiles -\documentclass[12pt,a4paper]{article} -\usepackage[margin={25mm,30mm}]{geometry} - -\usepackage[dvipsnames]{pstricks} -\usepackage{pst-node,pst-tree,psfrag} -\usepackage{pst-pdf} - -\pagestyle{empty} - -\begin{document} - -\section*{\textsf{pst-pdf:} A short example document} - -\subsection*{png graphic and postscript graphic together} - -\noindent\includegraphics[width=.35\textwidth]{knuth}% A none-ps graphic -\hfill -\includegraphics[width=.60\textwidth]{elephant}% A ps graphic - -\subsection*{PSTricks code inside a pspicture environment} - -\newpsobject{showgrid}{psgrid}{subgriddiv=1,griddots=10,gridlabels=8pt} - -\begin{center} -\begin{pspicture}(-5.25,-5.25)(5.25,5.25)% - \pscircle*[linecolor=Apricot]{5} - \rput(0,0.5){\includegraphics[width=8\psxunit]{elephant}} - \Huge\sffamily\bfseries - \rput(-4.5,4.5){A} \rput(4.5,4.5){B} - \rput(-4.5,-4.5){C}\rput(4.5,-4.5){D} - \rmfamily - \rput(0,-3.8){PSTricks} - \rput(0,3.8){\LaTeX} - \showgrid -\end{pspicture} -\end{center} - -\subsection*{PSTricks code without a pspicture environment} - -%%---------------------------------------------------------------------- -%% From: The \LaTeX\ Graphics Companion; first release. -\definecolor{pink}{rgb}{1, .75, .8} -\renewcommand\psedge{\nccurve} -\newcommand{\Female}[2][]{{\psset{linecolor=pink}\TR[#1]{\emph{#2}}}} -\newcommand{\Male}[2][]{{\psset{linecolor=blue}\TR[#1]{#2}}} -\psset{nodesep=2pt,angleA=90,angleB=-90} -\footnotesize - -\pstree[treemode=U]{\Female{{\bfseries Matilde}}}{% - \pstree{\Male{Sebastian}}{% - \pstree{\Male[name=P]{Philip}}{\Male{Frederick}\Female{Ethel}} - \pstree{\Female[name=W]{Mary}}{\Male{Lionel}\Female{Agnes}}} - \pstree{\Female{Leonor}}{% - \pstree{\Male[name=R]{Ra\'ul}}{\Male{Joaquim}\Female{J\'ulia}} - \pstree{\Female[name=A]{Am\'elia}}{\Male{\'Alvaro}\Female{Augusta}}} -} - -%%---------------------------------------------------------------------- - -\subsection*{psfrag demo} - -\normalsize - -\noindent -\includegraphics[width=.475\textwidth]{psf-demo.eps} -\hfill -\begin{psfrags} - \psfragscanon - \psfrag{x1}[br][ ]{\LaTeX} \psfrag{x2}[br][br]{\LaTeX} - \psfrag{x3}[br][tl]{\LaTeX} \psfrag{x4}[br][Br]{\LaTeX} - \psfrag{x5}[Br][ r][1.15][45]{\Huge\LaTeX} - \psfrag{x6}[tl][ l][1.15][45]{\Huge\LaTeX} - \includegraphics[width=.475\textwidth]{psf-demo} -\end{psfrags} - -\subsection*{The postscript environment} - -\begin{center} -\begin{postscript} -\Large -\noindent -$ - \bordermatrix{% - & A & B & C\cr - & \rnode{D}{D} & E & \rnode{F}{F}\cr - & G & H & I\cr - & \rnode{J}{J} & K & M - } -$ -\ncline[nodesep=-1em,linecolor=red]{D}{F} -\ncline[nodesep=-1em,linecolor=red]{D}{J} -\end{postscript} -\end{center} - -\end{document} -%</example1> -%<*example2> +%<*example> %% Process this file with the scripts `ps4pdf' or `ps4pdf.bat' or call %% -%% latex pst-pdf-example2.tex -%% dvips -Ppdf -o pst-pdf-example2-pics.ps pst-pdf-example2.dvi -%% ps2pdf -dAutoRotatePages=/None pst-pdf-example2-pics.ps pst-pdf-example2-pics.pdf -%% pdflatex pst-pdf-example2.tex +%% latex pst-pdf-example.tex +%% dvips -Ppdf -o pst-pdf-example-pics.ps pst-pdf-example.dvi +%% ps2pdf -dAutoRotatePages=/None pst-pdf-example-pics.ps pst-pdf-example-pics.pdf +%% pdflatex pst-pdf-example.tex %% \listfiles\errorcontextlines=100\relax \documentclass[12pt]{article} @@ -2115,4 +2004,4 @@ $ \mymatrix \end{document} -%</example2> +%</example> diff --git a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins index 9b58cf757e7..85468249513 100644 --- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins +++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins @@ -24,8 +24,7 @@ and version 1.2 or later is part of all distributions of LaTeX version \endpreamble \generate{\file{pst-pdf.sty}{\from{pst-pdf.dtx}{package}}} -\generate{\file{pst-pdf-example1.tex}{\from{pst-pdf.dtx}{example1}}} -\generate{\file{pst-pdf-example2.tex}{\from{pst-pdf.dtx}{example2}}} +\generate{\file{pst-pdf-example.tex}{\from{pst-pdf.dtx}{example}}} \obeyspaces \Msg{*************************************************************} diff --git a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty index b9e7b76c4a7..05e3e6073c9 100644 --- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty +++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{pst-pdf} - [2008/10/09 v1.1v PS graphics for pdfLaTeX (RN,HjG)] + [2016/07/11 v1.2a PS graphics for pdfLaTeX (RN,HjG)] \newcommand*\ppf@TeX@mode{-1} \newcommand*\ppf@draft{false} \newif\if@ppf@PST@used\@ppf@PST@usedtrue @@ -45,21 +45,20 @@ \ProcessOptions\relax \ifnum\ppf@TeX@mode=999\relax\expandafter\endinput\fi \ifnum\ppf@TeX@mode=-1\relax - \begingroup - \chardef\x=0 % - \@ifundefined{pdfoutput}{}{% - \ifcase\pdfoutput\else - \chardef\x=1 % - \fi - }% - \@ifundefined{OpMode}{}{\chardef\x=2 }% - \expandafter\endgroup - \ifcase\x - \def\ppf@TeX@mode{0}% - \or + \RequirePackage{ifpdf,ifxetex,ifvtex}% + \ifpdf \def\ppf@TeX@mode{1}% + \RequirePackage{luatex85}% \else - \def\ppf@TeX@mode{9}% + \ifvtex + \def\ppf@TeX@mode{9}% + \else + \ifxetex + \def\ppf@TeX@mode{9}% + \else + \def\ppf@TeX@mode{0}% + \fi + \fi \fi \fi \newcommand*\PDFcontainer{} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 960de1625be..d64f0dc241f 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2242,6 +2242,7 @@ $standardsource = '(\.(bat|c|drv|dtx|fea|fdd|ins|sfd)' 'patch', '\.doc', 'pdfx', 'rvdtx\.sty|' . $standardsource, 'poetrytex', 'Makefile|' . $standardsource, + 'pst-pdf', '\.(dtx|ins|e?ps|png)$|CHANGES.tex', 'pygmentex', 'NULL', # keep together 'rcs', 'rcs.el|src|' . $standardsource, 'ruhyphen', '^[^.]*$|README.ru|hyphen.rules', @@ -2686,6 +2687,7 @@ $standardttf = '\.ttf|\.TTC'; 'mycv' => 'mycv_split_contents\.pl', 'pgfmolbio' => '\.lua$', 'placeat' => '\.lua$', + 'pst-pdf' => '\.bat(.w95)?$', 'pythontex' => '([23]|_.*)\.py$', 'spelling' => '\.lua$', 'tex4ebook' => '\.lua$', @@ -2762,6 +2764,7 @@ $standardttf = '\.ttf|\.TTC'; 'pmx' => '\.lua$', 'pmxchords' => 'pmxchords\.lua$', 'petri-nets' => 'pn2pdf', + 'pst-pdf' => 'ps4pdf$', 'pst2pdf' => 'pst2pdf\.pl$', 'ptex2pdf' => 'ptex2pdf\.lua$', 'purifyeps' => 'purifyeps$', @@ -3550,14 +3553,24 @@ sub doscripts { next if $s =~ /pdf(book2|xup)/; next if $package eq "pdfjam"; # - if ($s eq "lua2dox_filter") { # handwritten .bat + if ($s eq "ps4pdf") { # package pst-pdf + # handwritten special .bat + &SYSTEM ("$CP $s.bat.noMiKTeX $platdir/$s.bat"); + # keep copy in scripts/ too, for clarity? + &SYSTEM ("$MV $s.bat.noMiKTeX $scriptsdir"); + # best to have wrapper also, maybe? + + } elsif ($s eq "lua2dox_filter") { # package lua2dox + # handwritten .bat &SYSTEM ("$MV $s.bat $platdir/"); next; # no wrapper - } - if ($s eq "latexindent.pl") { # provided .exe (made with par::packer) + + } elsif ($s eq "latexindent.pl") { + # provided .exe (made with par::packer) &SYSTEM ("$MV latexindent.exe $platdir/"); next; # no wrapper } + my $w32_wrapper = "$Build/$build_tldir/w32_wrapper/runscript.exe"; &SYSTEM ("$CP $w32_wrapper $platdir/$linkname.exe"); &SYSTEM ("$CP $w32_wrapper $platdir/r$linkname.exe") |