diff options
author | Norbert Preining <norbert@preining.info> | 2020-11-15 03:02:26 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-11-15 03:02:26 +0000 |
commit | f23cf64aec54b58502f0f334eab0ea486a317586 (patch) | |
tree | 19330e378b10eb1c92022d5fd3bc8c4b1e5f729a /macros/latex/contrib/graphicx-psmin | |
parent | 22ba19a8c9224d6e229b882ff226c05967f13ffd (diff) |
CTAN sync 202011150302
Diffstat (limited to 'macros/latex/contrib/graphicx-psmin')
-rw-r--r-- | macros/latex/contrib/graphicx-psmin/README | 4 | ||||
-rw-r--r-- | macros/latex/contrib/graphicx-psmin/graphicx-psmin.dtx | 23 | ||||
-rw-r--r-- | macros/latex/contrib/graphicx-psmin/graphicx-psmin.pdf | bin | 100347 -> 133194 bytes | |||
-rw-r--r-- | macros/latex/contrib/graphicx-psmin/graphicx-psmin.sty | 180 |
4 files changed, 17 insertions, 190 deletions
diff --git a/macros/latex/contrib/graphicx-psmin/README b/macros/latex/contrib/graphicx-psmin/README index f1c200bc47..e72bc71b53 100644 --- a/macros/latex/contrib/graphicx-psmin/README +++ b/macros/latex/contrib/graphicx-psmin/README @@ -1,4 +1,4 @@ -graphicx-psmin v1.1 +graphicx-psmin v1.2 ------------------- This package is an extension of the standard graphics bundle and @@ -42,7 +42,7 @@ graphicx-psmin into your LaTeX distribution License ------- -Copyright (C) 2005 Hendri Adriaens +Copyright (C) 2005-2020 Hendri Adriaens This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/graphicx-psmin/graphicx-psmin.dtx b/macros/latex/contrib/graphicx-psmin/graphicx-psmin.dtx index ecd5f2f668..1e09bf4fde 100644 --- a/macros/latex/contrib/graphicx-psmin/graphicx-psmin.dtx +++ b/macros/latex/contrib/graphicx-psmin/graphicx-psmin.dtx @@ -15,9 +15,9 @@ % file into a directory searched by LaTeX: % graphicx-psmin.sty % -%% ---------------------------------- -%% Copyright (C) 2005 Hendri Adriaens -%% ---------------------------------- +%% --------------------------------------- +%% Copyright (C) 2005-2020 Hendri Adriaens +%% --------------------------------------- %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -68,7 +68,9 @@ The author is grateful to Thomas Greer and Uwe Kern for help and suggestions. Many thanks to Akira Kakuto for providing a dvips patch which makes this package possible. The author is greatly indebted to Karl Berry for support and for providing a test environment for the -dvips patch on the TUG server. +dvips patch on the TUG server. Finally a word of thanks for David Carlisle +for providing a fix to make the package work with the latest \pf{graphicx} +package. \PrintChangesX\PrintIndexX \end{document} %</driver> @@ -78,7 +80,7 @@ dvips patch on the TUG server. % % \GetFileInfo{graphicx-psmin.sty} % -% \CheckSum{301} +% \CheckSum{310} % % \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 @@ -101,7 +103,7 @@ dvips patch on the TUG server. %\texttt{/macros/latex/contrib/graphicx-psmin}. See \texttt{graphicx-psmin.dtx} %for information on installing \pf{graphicx-psmin} into your \TeX\ or \LaTeX\ %distribution and for the license of this package.}} -%\author{\mktitledecor Hendri Adriaens\\\url{http://stuwww.uvt.nl/~hendri}} +%\author{\mktitledecor Hendri Adriaens} %\date{\fileversion\ (\filedate)} %\maketitle % @@ -277,7 +279,7 @@ dvips patch on the TUG server. %<*graphicx-psmin> \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphicx-psmin} - [2005/09/20 v1.1 single PostScript graphics inclusion (HA)] + [2020/11/14 v1.2 single PostScript graphics inclusion (HA)] \DeclareOption*{\PassOptionsToPackage\CurrentOption{graphicx}} \ProcessOptions\relax \RequirePackage{graphicx} @@ -475,6 +477,7 @@ dvips patch on the TUG server. % \end{macrocode} % \end{macro} % \begin{macro}{\gxpsm@checkfile} +% \changes{v1.2}{2020/11/14}{Changes to work with the latest \pf{graphicx} package} % \marg{file}\marg{actions}\\ % This is part of \pf{graphics}' |\Ginclude@graphics| which checks a % graphic file in the graphics path. We perform \meta{actions} when @@ -483,7 +486,11 @@ dvips patch on the TUG server. % \begin{macrocode} \def\gxpsm@checkfile#1#2{% \let\input@path\Ginput@path - \filename@parse{#1}% + \ifx\unquote@name\@undefined + \filename@parse{#1}% + \else + \expandafter\filename@parse\expandafter{\detokenize{#1}}% + \fi \ifx\filename@ext\relax \@for\Gin@temp:=\Gin@extensions\do{% \ifx\Gin@ext\relax diff --git a/macros/latex/contrib/graphicx-psmin/graphicx-psmin.pdf b/macros/latex/contrib/graphicx-psmin/graphicx-psmin.pdf Binary files differindex 06c6297284..6a0749d9c9 100644 --- a/macros/latex/contrib/graphicx-psmin/graphicx-psmin.pdf +++ b/macros/latex/contrib/graphicx-psmin/graphicx-psmin.pdf diff --git a/macros/latex/contrib/graphicx-psmin/graphicx-psmin.sty b/macros/latex/contrib/graphicx-psmin/graphicx-psmin.sty deleted file mode 100644 index 758b048b6c..0000000000 --- a/macros/latex/contrib/graphicx-psmin/graphicx-psmin.sty +++ /dev/null @@ -1,180 +0,0 @@ -%% -%% This is file `graphicx-psmin.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% graphicx-psmin.dtx (with options: `graphicx-psmin') -%% -%% ---------------------------------- -%% Copyright (C) 2005 Hendri Adriaens -%% ---------------------------------- -%% -%% 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. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% This Current Maintainer of this work is Hendri Adriaens. -%% -%% This work consists of the file graphicx-psmin.dtx and derived file -%% graphicx-psmin.sty. -%% -%% The following files constitute the graphicx-psmin bundle and must be -%% distributed as a whole: readme, graphicx-psmin.pdf, graphicx-psmin.sty -%% and graphicx-psmin.dtx. -%% -\NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{graphicx-psmin} - [2005/09/20 v1.1 single PostScript graphics inclusion (HA)] -\DeclareOption*{\PassOptionsToPackage\CurrentOption{graphicx}} -\ProcessOptions\relax -\RequirePackage{graphicx} -\def\gxpsm@tempa{dvips.def} -\ifx\Gin@driver\gxpsm@tempa\else - \PackageError{graphicx-psmin}{This package cannot be used with any - \MessageBreak back end driver other than dvips!}\@ehd - \def\loadgraphics{\@testopt\gxpsm@loadgraphics{}} - \def\gxpsm@loadgraphics[#1]#2{} - \expandafter\endinput -\fi -\ifGin@draft - \def\loadgraphics{\@testopt\gxpsm@loadgraphics{}} - \def\gxpsm@loadgraphics[#1]#2{} - \expandafter\endinput -\fi -\def\gxpsm@loaded{} -\def\@namexdef#1{\expandafter\xdef\csname#1\endcsname} -\def\loadgraphics{\@testopt\gxpsm@loadgraphics{}} -\def\gxpsm@loadgraphics[#1]#2{% - \@for\gxpsm@file:=#2\do{% - \begingroup - \gxpsm@checkfile\gxpsm@file{% - \ifx\@empty#1\@empty - \Gread@eps{\Gin@base\Gin@ext}% - \else - \Gread@parse@bb#1 \\ - \fi - \@namexdef{\Gin@base\Gin@ext @llx}{\Gin@llx}% - \@namexdef{\Gin@base\Gin@ext @lly}{\Gin@lly}% - \@namexdef{\Gin@base\Gin@ext @urx}{\Gin@urx}% - \@namexdef{\Gin@base\Gin@ext @ury}{\Gin@ury}% - \gxpsm@getcfile - \AtBeginDvi{\special{header={\Gin@base\Gin@ext} - pre={/\gxpsm@cfile-data^^Jcurrentfile^^J% - << /Filter /SubFileDecode^^J/DecodeParms << /EODCount 0 - /EODString (*HA-EOD-??3.1416926!!*) >>^^J>> - /ReusableStreamDecode filter^^J% - \@percentchar\@percentchar BeginDocument: - \Gin@base\Gin@ext^^J% - } - post={\@percentchar\@percentchar EndDocument^^J% - *HA-EOD-??3.1416926!!*^^Jdef^^J/\gxpsm@cfile-form^^J% - << /FormType 1^^J/BBox - [\Gin@llx\space\Gin@lly\space\Gin@urx\space\Gin@ury]^^J% - /Matrix [1 0 0 1 0 0]^^J/PaintProc^^J{ pop^^J% - /ostate save def^^J/showpage {} def^^J% - /setpagedevice /pop load def^^J% - \gxpsm@cfile-data 0 setfileposition - \gxpsm@cfile-data cvx exec^^J% - ostate restore^^J} bind^^J>> def% - } - }}% - \xdef\gxpsm@loaded{% - \gxpsm@loaded\ifx\gxpsm@loaded\@empty\else,\fi - \Gin@base\Gin@ext - }% - }% - \endgroup - }% -} -\@onlypreamble\loadgraphics -\@onlypreamble\gxpsm@loadgraphics -\def\gxpsm@getcfile{% - \edef\gxpsm@tempa{% - \noexpand\gxpsm@g@tcfile\Gin@base\Gin@ext\noexpand\@nil - }% - \gxpsm@tempa -} -\def\gxpsm@g@tcfile#1\@nil{% - \begingroup\lccode`\/`\_\lowercase{\endgroup\def\gxpsm@cfile{#1}}% -} -\def\Ginclude@graphics#1{% - \begingroup - \gxpsm@checkfile{#1}{% - \@expandtwoargs\in@{,\Gin@base\Gin@ext,}{,\gxpsm@loaded,}% - \ifin@ - \ifGin@bbox\else - \Gin@bboxtrue - \edef\Gin@llx{\@nameuse{\Gin@base\Gin@ext @llx}}% - \edef\Gin@lly{\@nameuse{\Gin@base\Gin@ext @lly}}% - \edef\Gin@urx{\@nameuse{\Gin@base\Gin@ext @urx}}% - \edef\Gin@ury{\@nameuse{\Gin@base\Gin@ext @ury}}% - \fi - \Gin@setfile{psdirect}{}{\Gin@base\Gin@ext}% - \else - \@ifundefined{Gin@rule@\Gin@ext}{% - \ifx\Gin@rule@*\@undefined - \@latex@error{Unknown graphics extension: \Gin@ext}\@ehc - \else - \expandafter\Gin@setfile\Gin@rule@*{\Gin@base\Gin@ext}% - \fi - }{% - \expandafter\expandafter\expandafter\Gin@setfile - \csname Gin@rule@\Gin@ext\endcsname{\Gin@base\Gin@ext}% - }% - \fi - }% - \endgroup -} -\def\gxpsm@checkfile#1#2{% - \let\input@path\Ginput@path - \filename@parse{#1}% - \ifx\filename@ext\relax - \@for\Gin@temp:=\Gin@extensions\do{% - \ifx\Gin@ext\relax - \Gin@getbase\Gin@temp - \fi - }% - \else - \Gin@getbase{\Gin@sepdefault\filename@ext}% - \ifx\Gin@ext\relax - \@warning{File `#1' not found}% - \def\Gin@base{\filename@area\filename@base}% - \edef\Gin@ext{\Gin@sepdefault\filename@ext}% - \fi - \fi - \ifx\Gin@ext\relax - \@latex@error{File `#1' not found}% - {I could not locate the file with any of these extensions:^^J% - \Gin@extensions^^J\@ehc}% - \else#2\fi -} -\def\Ginclude@psdirect#1{% - \message{<#1>}% - \bgroup - \def\@tempa{!}% - \gxpsm@getcfile - \dimen@\Gin@req@width - \dimen@ii.1bp% - \divide\dimen@\dimen@ii - \@tempdima\Gin@req@height - \divide\@tempdima\dimen@ii - \special{ps:@beginspecial - \Gin@llx\space @llx \Gin@lly\space @lly - \Gin@urx\space @urx \Gin@ury\space @ury - \ifx\Gin@scalex\@tempa\else\number\dimen@\space @rwi\fi - \ifx\Gin@scaley\@tempa\else\space\number\@tempdima\space @rhi\fi - \ifGin@clip\space @clip\fi\space @setspecial^^J - save \gxpsm@cfile-form execform restore showpage @endspecial - }% - \egroup -} -\endinput -%% -%% End of file `graphicx-psmin.sty'. |