summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/pst-pdf
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-10-11 03:01:22 +0000
committerNorbert Preining <norbert@preining.info>2020-10-11 03:01:22 +0000
commitfdb18507cd80dc17f5a5256153d34668b4f4e61c (patch)
treec9d29f5cf249caaebc96a3d199af10b250f51b2a /macros/latex/contrib/pst-pdf
parent03964f11f0331968e99fa5a3d614f25a7b3f8a95 (diff)
CTAN sync 202010110301
Diffstat (limited to 'macros/latex/contrib/pst-pdf')
-rw-r--r--macros/latex/contrib/pst-pdf/CHANGES3
-rw-r--r--macros/latex/contrib/pst-pdf/Makefile6
-rwxr-xr-xmacros/latex/contrib/pst-pdf/ps4pdf.bat132
-rw-r--r--macros/latex/contrib/pst-pdf/ps4pdf.bat.w9514
-rw-r--r--macros/latex/contrib/pst-pdf/pst-pdf-DE.pdfbin508746 -> 508125 bytes
-rw-r--r--macros/latex/contrib/pst-pdf/pst-pdf-example.pdfbin250157 -> 249990 bytes
-rw-r--r--macros/latex/contrib/pst-pdf/pst-pdf.dtx84
-rw-r--r--macros/latex/contrib/pst-pdf/pst-pdf.pdfbin434072 -> 516267 bytes
8 files changed, 122 insertions, 117 deletions
diff --git a/macros/latex/contrib/pst-pdf/CHANGES b/macros/latex/contrib/pst-pdf/CHANGES
index db9952fe79..1b78f94da0 100644
--- a/macros/latex/contrib/pst-pdf/CHANGES
+++ b/macros/latex/contrib/pst-pdf/CHANGES
@@ -148,3 +148,6 @@ v1.2e
expanded to \pdfTeXext
General: gobble optional argument for \makeindex, \makeglossary
and \printindex
+v1.2f
+ General: No more loading of file ‘dvisps.def’ (RN)
+ No more loading of file ‘pdftex.def’ (RN)
diff --git a/macros/latex/contrib/pst-pdf/Makefile b/macros/latex/contrib/pst-pdf/Makefile
index 2c5f7e7305..17eb36728d 100644
--- a/macros/latex/contrib/pst-pdf/Makefile
+++ b/macros/latex/contrib/pst-pdf/Makefile
@@ -53,6 +53,7 @@ dist : doc doc-DE pdf example CHANGES
@ echo $(ARCHNAME).tar.gz
%.gls %.pdf : %.dtx $(PACKAGE).sty
+ $(PDFLATEX) $<
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 \
@@ -62,13 +63,14 @@ dist : doc doc-DE pdf example CHANGES
$(PDFLATEX) $<
$(PACKAGE)-DE.gls $(PACKAGE)-DE.pdf : $(PACKAGE).dtx $(PACKAGE).sty
+ cp $< $(basename $@).dtx
+ $(PDFLATEX) '\newcommand*{\mainlang}{ngerman}\input{$(basename $@).dtx}'
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
@@ -125,6 +127,8 @@ arch-tds : CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf
clean :
$(RM) $(addprefix $(PACKAGE), \
.dvi .log .aux .bbl .blg .idx .ind .ilg .gls .glg .glo) \
+ $(addprefix $(PACKAGE)-DE, \
+ .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
diff --git a/macros/latex/contrib/pst-pdf/ps4pdf.bat b/macros/latex/contrib/pst-pdf/ps4pdf.bat
index b60630d862..62e0d659a5 100755
--- a/macros/latex/contrib/pst-pdf/ps4pdf.bat
+++ b/macros/latex/contrib/pst-pdf/ps4pdf.bat
@@ -1,69 +1,69 @@
-:: **********************************************
-:: ps4pdf.bat
-:: author Lutz Ihlenburg, 09-may-2005
-::
-:: Batch file for using Rolf Niepraschk's package
-:: pst-pdf under MiKTeX
-::
-:: More info: ps4pdf-bat.txt
-:: **********************************************
-
-@echo off
-:: Command extensions must be enabled (Default in Windows XP)
-:: Localize temporary variables
-setlocal
-
-:: Called with no argument?
-if {%1} == {} goto USAGE
-if {%1} == {/?} goto USAGE
-if {%1} == {-h} goto USAGE
-if {%1} == {--help} goto USAGE
-
-:: Look for existence of main tex file.
-:: This procedure will not work, if You transfer a filename without extension,
-:: having dots in the name :-)
-:: Command shell for-statement allows only one command.
-:: For more, a multiple command must be created with &
-for %%a in (%1) do set _fullname=%%~fa& set _drive=%%~da& set _path=%%~pa& set _name=%%~na& set _ext=%%~xa
-:: XP command shell doesn't know "if not defined..."
-if defined _ext (
-rem
-) else (
-set _ext=.tex
-set _fullname=%_fullname%.tex
-)
-if not exist "%_fullname%" goto :MISSINGFILE
-
-:OPERATION
-%_drive%
-cd %_path%
-@echo on
-latex --src -interaction=nonstopmode "%_name%%_ext%" >"%_name%-ps4pdf.log"
-@if errorlevel 1 goto :ERROR
-dvips -o "%_name%-pics.ps" "%_name%.dvi" >>"%_name%-ps4pdf.log"
-@if errorlevel 1 goto :ERROR
-ps2pdf -dAutoRotatePages#/None "%_name%-pics.ps" >>"%_name%-ps4pdf.log"
-@if errorlevel 1 goto :ERROR
-texify -b -l latex -p "%_name%%_ext%" >>"%_name%-ps4pdf.log"
-@if errorlevel 1 goto :ERROR
-@goto :EOF
-
-:MISSINGFILE
-echo *** File not found: %_fullname%
-echo *** Batch job aborted
-pause
-goto :EOF
-
-:ERROR
-@echo *** An error message appeared. Abnormal termination! Look at %_name%-pst-pdf.log ***
-@pause
-@goto :EOF
-
-:USAGE
-for %%a in (%0) do set _progname=%%~na
-echo Usage: %_progname% SourceFile[.tex]
-pause
-goto :EOF
+:: **********************************************
+:: ps4pdf.bat
+:: author Lutz Ihlenburg, 09-may-2005
+::
+:: Batch file for using Rolf Niepraschk's package
+:: pst-pdf under MiKTeX
+::
+:: More info: ps4pdf-bat.txt
+:: **********************************************
+
+@echo off
+:: Command extensions must be enabled (Default in Windows XP)
+:: Localize temporary variables
+setlocal
+
+:: Called with no argument?
+if {%1} == {} goto USAGE
+if {%1} == {/?} goto USAGE
+if {%1} == {-h} goto USAGE
+if {%1} == {--help} goto USAGE
+
+:: Look for existence of main tex file.
+:: This procedure will not work, if You transfer a filename without extension,
+:: having dots in the name :-)
+:: Command shell for-statement allows only one command.
+:: For more, a multiple command must be created with &
+for %%a in (%1) do set _fullname=%%~fa& set _drive=%%~da& set _path=%%~pa& set _name=%%~na& set _ext=%%~xa
+:: XP command shell doesn't know "if not defined..."
+if defined _ext (
+rem
+) else (
+set _ext=.tex
+set _fullname=%_fullname%.tex
+)
+if not exist "%_fullname%" goto :MISSINGFILE
+
+:OPERATION
+%_drive%
+cd %_path%
+@echo on
+latex --src -interaction=nonstopmode "%_name%%_ext%" >"%_name%-ps4pdf.log"
+@if errorlevel 1 goto :ERROR
+dvips -o "%_name%-pics.ps" "%_name%.dvi" >>"%_name%-ps4pdf.log"
+@if errorlevel 1 goto :ERROR
+ps2pdf -dAutoRotatePages#/None "%_name%-pics.ps" >>"%_name%-ps4pdf.log"
+@if errorlevel 1 goto :ERROR
+texify -b -l latex -p "%_name%%_ext%" >>"%_name%-ps4pdf.log"
+@if errorlevel 1 goto :ERROR
+@goto :EOF
+
+:MISSINGFILE
+echo *** File not found: %_fullname%
+echo *** Batch job aborted
+pause
+goto :EOF
+
+:ERROR
+@echo *** An error message appeared. Abnormal termination! Look at %_name%-pst-pdf.log ***
+@pause
+@goto :EOF
+
+:USAGE
+for %%a in (%0) do set _progname=%%~na
+echo Usage: %_progname% SourceFile[.tex]
+pause
+goto :EOF
%~na
echo Usage: %_progname% SourceFile[.tex]
pause
diff --git a/macros/latex/contrib/pst-pdf/ps4pdf.bat.w95 b/macros/latex/contrib/pst-pdf/ps4pdf.bat.w95
index ce73848182..c507b37693 100644
--- a/macros/latex/contrib/pst-pdf/ps4pdf.bat.w95
+++ b/macros/latex/contrib/pst-pdf/ps4pdf.bat.w95
@@ -1,8 +1,8 @@
-rem call with ps4pdf.bat FILE without suffix
-@echo off
-set FILE=%1
-latex %FILE%.tex
-dvips -Ppdf -o %FILE%-pics.ps %FILE%.dvi
-ps2pdf -dAutoRotatePages#/None %File%-pics.ps %File%-pics.pdf
-texify -b -l latex -p %File%.tex
+rem call with ps4pdf.bat FILE without suffix
+@echo off
+set FILE=%1
+latex %FILE%.tex
+dvips -Ppdf -o %FILE%-pics.ps %FILE%.dvi
+ps2pdf -dAutoRotatePages#/None %File%-pics.ps %File%-pics.pdf
+texify -b -l latex -p %File%.tex
%.tex
diff --git a/macros/latex/contrib/pst-pdf/pst-pdf-DE.pdf b/macros/latex/contrib/pst-pdf/pst-pdf-DE.pdf
index 561f570f1b..b1c1ebfed2 100644
--- a/macros/latex/contrib/pst-pdf/pst-pdf-DE.pdf
+++ b/macros/latex/contrib/pst-pdf/pst-pdf-DE.pdf
Binary files differ
diff --git a/macros/latex/contrib/pst-pdf/pst-pdf-example.pdf b/macros/latex/contrib/pst-pdf/pst-pdf-example.pdf
index d910e4a708..f6d4756d7f 100644
--- a/macros/latex/contrib/pst-pdf/pst-pdf-example.pdf
+++ b/macros/latex/contrib/pst-pdf/pst-pdf-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/pst-pdf/pst-pdf.dtx b/macros/latex/contrib/pst-pdf/pst-pdf.dtx
index bf3cbc1a48..55841e50ef 100644
--- a/macros/latex/contrib/pst-pdf/pst-pdf.dtx
+++ b/macros/latex/contrib/pst-pdf/pst-pdf.dtx
@@ -24,7 +24,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{pst-pdf}
%<*package>
- [2019/11/15 v1.2e PS graphics for pdfLaTeX (RN,HjG)]
+ [2020/10/10 v1.2f PS graphics for pdfLaTeX (RN,HjG)]
%</package>
%
%<*driver>
@@ -50,7 +50,7 @@
%</driver>
% \fi
%
-% \CheckSum{839}
+% \CheckSum{818}
%
% \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
@@ -748,7 +748,8 @@
\newcommand*\ppf@is@pdfTeX@graphic[5]{%
\@ppf@pdftex@graphicfalse%
\begingroup
- \edef\pdfTeXext{\detokenize\expandafter{#2}}%
+ \edef\pdfTeXext{,#2,}%
+ \edef\pdfTeXext{\detokenize\expandafter{\pdfTeXext}}%
% \end{macrocode}
% \ifGERMAN
% Statt Einladen einer identifizierten Grafik nur Test der Grafikendung.
@@ -758,7 +759,8 @@
% \fi
% \begin{macrocode}
\def\Gin@setfile##1##2##3{%
- \@expandtwoargs\in@{,\detokenize\expandafter{##2},}{,\pdfTeXext,}%
+ \edef\@tempa{,##2,}%
+ \@expandtwoargs\in@{\detokenize\expandafter{\@tempa}}{\pdfTeXext}%
\ifin@\global\@ppf@pdftex@graphictrue\fi}%
% \end{macrocode}
% \ifGERMAN
@@ -822,7 +824,7 @@
% \changes{v1.1q}{2008/02/17}{\cmd{\overfullrule} must not be > 0.}
% \begin{macrocode}
\PackageInfo{pst-pdf}{%
- MODE: \ppf@TeX@mode\space (dvi -- extraction mode)}
+ MODE: \ppf@TeX@mode\space (dvi -- extraction mode)}%
\nofiles
\let\makeindex\@empty \let\makeglossary\@empty \let\printindex\@empty
\renewcommand*\makeindex[1][]{}%
@@ -831,31 +833,28 @@
\AtBeginDocument{\overfullrule=\z@}%
\if@ppf@PST@used\RequirePackage{pstricks}\fi
\RequirePackage[active,dvips,tightpage]{preview}[2005/01/29]%
- \newcommand*\ppf@PreviewBbAdjust{}
+ \newcommand*\ppf@PreviewBbAdjust{}%
\newcommand*\ppf@RestoreBbAdjust{%
\let\PreviewBbAdjust\ppf@PreviewBbAdjust}%
% \end{macrocode}
% \ifGERMAN
% Es werden auch die im pdf\LaTeX-Modus erlaubten Endungen von Grafikdateien
-% ben\"otigt.
+% ben\"otigt (Argument aus `pdftex.def' -- 2020/10/05 -- kopiert).
% \fi
% \ifENGLISH
% The pdf\LaTeX\ mode compliant graphics file formats are needed too.
+% (Argument copied from `pdftex.def' -- 2020/10/05).
% \fi
% \changes{v1.1u}{2008/09/16}{\cmd{\pdfoutput} must be set when
% loading ``pdftex.def'' in DVI mode. (RN)}
% \changes{v1.1v}{2008/10/09}{Local redefinition of \cmd{\pdfoutput} to be a
% counter. (RN)}
+% \changes{v1.2f}{2020/10/10}{No more loading of file `pdftex.def' (RN)}
% \begin{macrocode}
- \begingroup
- \let\AtBeginDocument\@gobble \let\PackageWarningNoLine\@gobbletwo
- \chardef\pdftexversion=121 %
- \newcount\pdfoutput
- \pdfoutput=1 %
- \input{pdftex.def}%
- \edef\x{\endgroup\def\noexpand\ppf@other@extensions{\Gin@extensions}
- }%
- \x
+ \def\ppf@other@extensions{%
+ .pdf,.png,.jpg,.mps,.jpeg,.jbig2,.jb2,%
+ .PDF,.PNG,.JPG,.JPEG,.JBIG2,.JB2%
+ }
% \end{macrocode}
% \changes{v1.1c}{2005/04/17}{Supress handling of pdf\LaTeX\ graphic
% formats in DVI mode. (RN)}
@@ -903,7 +902,7 @@
\define@key{Gin}{ignore}[true]{}%
\define@key{Gin}{showname}[true]{}%
\define@key{Gin}{namefont}{}%
- \@ifundefined{Gin@page}{\define@key{Gin}{page}{}}{}
+ \@ifundefined{Gin@page}{\define@key{Gin}{page}{}}{}%
% \end{macrocode}
% \changes{v1.0o}{2005/03/12}{New code for ``notightpage''. (RN)}
% \changes{v1.1r}{2008/05/02}{Fixed values for \cmd{\PreviewBbAdjust}
@@ -989,7 +988,7 @@
\expandafter\let\expandafter\ppf@pr@psmatrix%
\expandafter=\csname pr@\string\psmatrix\endcsname
\let\ppf@endpsmatrix=\endpsmatrix
- \def\psmatrix{\ppf@test@mmode\ppf@psmatrix}
+ \def\psmatrix{\ppf@test@mmode\ppf@psmatrix}%
\expandafter\def\csname pr@\string\psmatrix\endcsname{%
\ppf@set@mode\ppf@pr@psmatrix}%
\def\endpsmatrix{\ppf@endpsmatrix\ppf@set@mode}%
@@ -1030,7 +1029,7 @@
?({#{(#1)}{({#1})}}{}%
?({#{(#1)}{({#1})}}{}%
?({#{(#1)}{({#1})}}{}%
- }]{\pst@object}}
+ }]{\pst@object}}%
% \end{macrocode}
% \ifGERMAN
% Mehrfaches testweises Setzen von Tabelleninhalten durch ``tabularx''
@@ -1072,7 +1071,7 @@
% \begin{macrocode}
\def\Gscale@@box#1#2#3{%
\toks@{\mbox}%
- }
+ }%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\Ginclude@graphics}
@@ -1175,7 +1174,7 @@
% \begin{macrocode}
\if@ppf@PST@used
\let\ppf@temp\AtBeginDvi\let\AtBeginDvi\@gobble
- \def\c@lor@to@ps#1 #2\@@{}
+ \def\c@lor@to@ps#1 #2\@@{}%
\RequirePackage{pstricks}\let\AtBeginDvi\ppf@temp
\fi
% \end{macrocode}
@@ -1192,8 +1191,8 @@
% Necessary if PSTricks $<$ 2.0.
% \fi
% \begin{macrocode}
- \PSTricksOff
- \def\c@lor@to@ps#1 #2\@@{}
+ \PSTricksOff%
+ \def\c@lor@to@ps#1 #2\@@{}%
}%
}%
% \end{macrocode}
@@ -1204,7 +1203,7 @@
% \PS\ output is now inhibited and later once again.
% \fi
% \begin{macrocode}
- \the\@temptokena
+ \the\@temptokena%
\expandafter\AtBeginDocument\expandafter
{\the\@temptokena\@temptokena{}}%
\@ifundefined{PSTricksLoaded}{}{%
@@ -1294,16 +1293,15 @@
% \end{macrocode}
% \ifGERMAN
% Es werden auch die im DVI-Modus erlaubten Endungen von Grafikdateien
-% ben\"otigt.
+% ben\"otigt (Argument aus `dvips.def' -- 2017/06/20 -- kopiert).
% \fi
% \ifENGLISH
% Too the supported file name extensions from DVI mode are needed.
+% (Argument copied from `dvips.def' -- 2017/06/20).
% \fi
-% \begin{macrocode}
- \begingroup
- \input{dvips.def}%
- \edef\x{\endgroup\def\noexpand\ppf@other@extensions{\Gin@extensions}}%
- \x
+% \changes{v1.2f}{2020/10/10}{No more loading of file `dvisps.def' (RN)}
+% \begin{macrocode}
+ \def\ppf@other@extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z,.mps}%
% \end{macrocode}
% \ifGERMAN
% Dummy-Definition f\"ur die im DVI-Modus g\"ultigen Dateitypen.
@@ -1336,7 +1334,7 @@
\or
\ifGin@frame\else\let\@tempa\relax\fi
\fi
- \@tempa
+ \@tempa%
}%
\define@key{Gin}{showname}[true]{%
\lowercase{\Gin@boolkey{#1}}{showname}}%
@@ -1344,7 +1342,7 @@
\begingroup
\@temptokena\expandafter{\ppf@namefont#1}%
\edef\x{\endgroup\def\noexpand\ppf@namefont{\the\@temptokena}}%
- \x
+ \x%
}%
\newcommand*\ppf@filename{}%
\newcommand*\ppf@namefont{\tiny\ttfamily}%
@@ -1435,11 +1433,11 @@
% ``|frame@@=0|''\,$=$\,inner frame, ``|frame@@=1|''\,$=$\,outer frame.
% \fi
% \begin{macrocode}
- \edef\@tempa{\noexpand\ppf@Gin@ii[frame@@=0,\the\@temptokena,
+ \edef\@tempa{\noexpand\ppf@Gin@ii[frame@@=0,\the\@temptokena,%
frame@@=1]{\ppf@tempb}}%
- \@tempa
+ \@tempa%
\ifGin@showname
- \ppf@namefont
+ \ppf@namefont%
\raisebox{-\ht\strutbox}[0pt][0pt]{\llap{\ppf@filename}}%
\gdef\ppf@filename{}%
\fi
@@ -1493,8 +1491,8 @@
\ifnum\c@pspicture>\z@
\filename@parse{\PDFcontainer}%
\PackageWarningNoLine{pst-pdf}{%
- File `\PDFcontainer' not found.\MessageBreak
- Use the following commands to create it:\MessageBreak
+ File `\PDFcontainer' not found. \MessageBreak
+ Use the following commands to create it: \MessageBreak
----------------------------------------------------
\MessageBreak
latex \jobname.tex\MessageBreak
@@ -1568,7 +1566,7 @@
\else
\def\ppf@Gin@keys{}%
\fi
- \ppf@@getpicture
+ \ppf@@getpicture%
\Collect@Body\@gobble}{}%
\AtBeginDocument{%
\@ifundefined{PSTricksLoaded}{}{%
@@ -1649,15 +1647,15 @@
\xdef\ppf@filename{#2}%
\setbox\z@\hbox{\pdfrefximage\@nameuse{ppf@@@#2}}%
\Gin@nat@height\ht\z@ \Gin@nat@width\wd\z@
- \def\Gin@llx{0} \let\Gin@lly\Gin@llx
+ \def\Gin@llx{0}\let\Gin@lly\Gin@llx
\Gin@defaultbp\Gin@urx{\Gin@nat@width}%
\Gin@defaultbp\Gin@ury{\Gin@nat@height}%
- \Gin@bboxtrue\Gin@viewport@code
+ \Gin@bboxtrue\Gin@viewport@code%
\Gin@nat@height\Gin@ury bp%
\advance\Gin@nat@height-\Gin@lly bp%
\Gin@nat@width\Gin@urx bp%
\advance\Gin@nat@width-\Gin@llx bp%
- \Gin@req@sizes
+ \Gin@req@sizes%
\ht\z@\Gin@req@height \wd\z@\Gin@req@width
\leavevmode\box\z@}%
\define@key{Gin}{type}{}%
@@ -1748,14 +1746,14 @@
% \fi
% \begin{macrocode}
\PackageInfo{pst-pdf}{MODE: \ppf@TeX@mode\space (inactive mode)}%
- \newenvironment{postscript}[1][]{\ignorespaces}{}
+ \newenvironment{postscript}[1][]{\ignorespaces}{}%
\let\ppf@is@pdfTeX@graphic\relax
\fi
% \end{macrocode}
% \changes{v1.0f}{2005/02/04}{Config file loading added. (RN)}
% \begin{macrocode}
\InputIfFileExists{pst-pdf.cfg}{%
- \PackageInfo{pst-pdf}{Local config file pst-pdf.cfg used}}{}
+ \PackageInfo{pst-pdf}{Local config file pst-pdf.cfg used}}{}%
%</package>
% \end{macrocode}
%
diff --git a/macros/latex/contrib/pst-pdf/pst-pdf.pdf b/macros/latex/contrib/pst-pdf/pst-pdf.pdf
index f314a58682..9a92fbd080 100644
--- a/macros/latex/contrib/pst-pdf/pst-pdf.pdf
+++ b/macros/latex/contrib/pst-pdf/pst-pdf.pdf
Binary files differ