From 0bcaa5bcc56f99dc5f4d672dd113a2fd2a838f56 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 10 Oct 2020 20:54:11 +0000 Subject: pst-pdf (10oct20) git-svn-id: svn://tug.org/texlive/trunk@56622 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty | 72 ++++++++++++------------- 1 file changed, 33 insertions(+), 39 deletions(-) (limited to 'Master/texmf-dist/tex') 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 949806e6fa8..a0752d18b40 100644 --- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty +++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty @@ -24,7 +24,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{pst-pdf} - [2019/11/15 v1.2e PS graphics for pdfLaTeX (RN,HjG)] + [2020/10/10 v1.2f PS graphics for pdfLaTeX (RN,HjG)] \newcommand*\ppf@TeX@mode{-1} \newcommand*\ppf@draft{false} \newif\if@ppf@PST@used\@ppf@PST@usedtrue @@ -87,9 +87,11 @@ \newcommand*\ppf@is@pdfTeX@graphic[5]{% \@ppf@pdftex@graphicfalse% \begingroup - \edef\pdfTeXext{\detokenize\expandafter{#2}}% + \edef\pdfTeXext{,#2,}% + \edef\pdfTeXext{\detokenize\expandafter{\pdfTeXext}}% \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}% \edef\Gin@extensions{#2,#3}% \pr@outerfalse\ppf@Ginclude@graphics{#1}% @@ -98,7 +100,7 @@ } \ifcase\ppf@TeX@mode\relax \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][]{}% @@ -107,18 +109,13 @@ \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}% - \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% + } \AtBeginDocument{% \@ifpackageloaded{keyval}{% \def\KV@errx#1{\PackageInfo{keyval}{#1}}% @@ -134,7 +131,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}{}}{}% \if@ppf@tightpage\else \def\PreviewBbAdjust{% -600pt -600pt 600pt 600pt}% @@ -178,7 +175,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}% @@ -189,7 +186,7 @@ ?({#{(#1)}{({#1})}}{}% ?({#{(#1)}{({#1})}}{}% ?({#{(#1)}{({#1})}}{}% - }]{\pst@object}} + }]{\pst@object}}% \@ifundefined{tabularx}{}{% \newcolumntype{X}{c}% \expandafter\let\expandafter\tabularx\csname tabular*\endcsname @@ -200,7 +197,7 @@ }% \def\Gscale@@box#1#2#3{% \toks@{\mbox}% - } + }% \def\Ginclude@graphics#1{% \ifpr@outer \ppf@is@pdfTeX@graphic{#1}{\ppf@other@extensions}{\Gin@extensions}% @@ -216,18 +213,18 @@ \PackageInfo{pst-pdf}{MODE: \ppf@TeX@mode\space (pdfTeX mode)}% \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 \@temptokena{% \let\Gin@PS@file@header\@gobble\let\Gin@PS@literal@header\@gobble \let\Gin@PS@raw\@gobble\let\Gin@PS@restored\@gobble \@ifundefined{PSTricksLoaded}{}{% - \PSTricksOff - \def\c@lor@to@ps#1 #2\@@{} + \PSTricksOff% + \def\c@lor@to@ps#1 #2\@@{}% }% }% - \the\@temptokena + \the\@temptokena% \expandafter\AtBeginDocument\expandafter {\the\@temptokena\@temptokena{}}% \@ifundefined{PSTricksLoaded}{}{% @@ -267,10 +264,7 @@ }]{\pst@object}}% }% }% - \begingroup - \input{dvips.def}% - \edef\x{\endgroup\def\noexpand\ppf@other@extensions{\Gin@extensions}}% - \x + \def\ppf@other@extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z,.mps}% \DeclareGraphicsRule{*}{eps}{*}{}% \define@key{Gin}{innerframe}[true]{% \lowercase{\Gin@boolkey{#1}}{innerframe}}% @@ -285,7 +279,7 @@ \or \ifGin@frame\else\let\@tempa\relax\fi \fi - \@tempa + \@tempa% }% \define@key{Gin}{showname}[true]{% \lowercase{\Gin@boolkey{#1}}{showname}}% @@ -293,7 +287,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}% @@ -319,11 +313,11 @@ }% \fi \ifGin@ignore\else - \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 @@ -353,8 +347,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 @@ -388,7 +382,7 @@ \else \def\ppf@Gin@keys{}% \fi - \ppf@@getpicture + \ppf@@getpicture% \Collect@Body\@gobble}{}% \AtBeginDocument{% \@ifundefined{PSTricksLoaded}{}{% @@ -418,15 +412,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}{}% @@ -461,11 +455,11 @@ } \else \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 \InputIfFileExists{pst-pdf.cfg}{% - \PackageInfo{pst-pdf}{Local config file pst-pdf.cfg used}}{} + \PackageInfo{pst-pdf}{Local config file pst-pdf.cfg used}}{}% \endinput %% %% End of file `pst-pdf.sty'. -- cgit v1.2.3