From 19d25b8009801aa98ea2f46b45c37c257f990491 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 4 Mar 2020 03:02:32 +0000 Subject: CTAN sync 202003040302 --- macros/plain/graphics/README.md | 112 +++++++++++++++++++++++++++++++++++++ macros/plain/graphics/README.txt | 107 ----------------------------------- macros/plain/graphics/color.tex | 25 ++++++++- macros/plain/graphics/exmplgrf.tex | 4 +- macros/plain/graphics/exmplpfg.tex | 3 + macros/plain/graphics/graphicx.tex | 23 +++++++- macros/plain/graphics/miniltx.tex | 29 +++++++++- 7 files changed, 189 insertions(+), 114 deletions(-) create mode 100644 macros/plain/graphics/README.md delete mode 100644 macros/plain/graphics/README.txt (limited to 'macros/plain') diff --git a/macros/plain/graphics/README.md b/macros/plain/graphics/README.md new file mode 100644 index 0000000000..e975cff9ab --- /dev/null +++ b/macros/plain/graphics/README.md @@ -0,0 +1,112 @@ +# graphics-pln + +## Graphics code for non-LaTeX users. + +This directory provides a small wrapper file such that users of +formats based on plain TeX may make use of some of the parts of the +standard LaTeX distribution. + +These files are *NOT* supported by the LaTeX3 project, and any +problems with them should *NOT* be reported to the LaTeX bugs system. + +Problems should be reported as issues at +https://github.com/davidcarlisle/graphics-pln/issues + + +David Carlisle +1995/01/29 +1996/11/13 +2016/08/17 +2017/06/01 +2018/01/16 +2020/03/02 + +Copyright 1995 1996 2016 2017 2018 2020 David Carlisle + + All the files in this directory may 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; either + version 1 of the License, or (at your option) any later version. + + + +This directory contains + +- README.md + This file. + +- exmplpic.tex + A plain TeX document using LaTeX' `picture mode': a portable + means of producing simple diagrams. + +- exmplgrf.tex + A plain TeX document using the LaTeX graphicx package, for + rotating and scaling text, and include PostScript and other + graphics formats. (This will include the file a.ps available + in the LaTeX graphics distribution.) + +- exmplcol.tex + A plain TeX document using the LaTeX color package, for + producing colour. + +- exmplpfg.tex + A plain TeX document using the contributed LaTeX psfrag package, + for including PostScript documents, while replacing certain text + strings with TeX typeset replacements. This uses the example.eps + figure from the psfrag 3.0 distribution. + +- miniltx.tex + A small `miniLaTeX' that defines fakes or otherwise hacks + sufficient bits of LaTeX internals so that the packages can load. + +- picture.tex + The user interface to the picture environment. + `\input picture` + Normally a plain-style syntax is used, viz + ``` + \picture(100,100) + .... + \endpicture + ``` + + However if the command `\LaTeXbegin` is issued, then a LaTeX + syntax of + \begin{picture}(100,100) + .... + \end{picture} + May be used. this may be prefered if the picture is being copied + from a LaTeX document, or if it is produced automatically from + a drawing tool such as xfig or texcad. + +- autopict.sty + This is a frozen copy of a file that used to be distributed with + LaTeX but is no longer needed in that context, it is basically + the source of LaTeX Picture mode from LaTeX in 2014. The + original use for this package was to build a latex format in + which some environments such as picture and tabbing were not + defined by default, to save space if working with TeX on a + machine with 640K memory. + + +- graphicx.tex + The user interface to the graphicx package. + `\input graphicx` + See the documentation in grfguide.ps in the LaTeX graphics + distribution. + This file sets the driver to be dvips, pdftex or luatex. + If you use another driver, define `\Gin@driver` before inputting the file. + +- color.tex + The user interface to the color package. + `\input color` + See the documentation in grfguide.ps in the LaTeX graphics + distribution. + This file sets the driver to be dvips, pdftex or luatex. + If you use another driver, define `\Gin@driver` before inputting the file. + + +- psfrag.tex + The user interface to the psfrag package. + `\input psfrag` + See the documentation in pfgguide.tex in the psfrag distribution, + and the example document pfgexmpl.tex included here. diff --git a/macros/plain/graphics/README.txt b/macros/plain/graphics/README.txt deleted file mode 100644 index fc65eaf69b..0000000000 --- a/macros/plain/graphics/README.txt +++ /dev/null @@ -1,107 +0,0 @@ - -Graphics code for non-LaTeX users. -================================== - -This directory provides a small wrapper file such that users of -formats based on plain TeX may make use of some of the parts of the -standard LaTeX distribution. - -These files are *NOT* supported by the LaTeX3 project, and any -problems with them should *NOT* be reported to the LaTeX bugs system. - -Problems should be reported as issues at -https://github.com/davidcarlisle/dpctex/tree/master/graphics-pln - - -David Carlisle 1995/01/29 - 1996/11/13 - 2016/08/17 - 2017/06/01 - 2018/01/16 - -Copyright 1995 1996 2016 2017 2018 David Carlisle - - All the files in this directory may 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; either - version 1 of the License, or (at your option) any later version. - - - -This directory contains - -README.txt This file. - -exmplpic.tex - A plain TeX document using LaTeX' `picture mode': a portable - means of producing simple diagrams. - -exmplgrf.tex - A plain TeX document using the LaTeX graphicx package, for - rotating and scaling text, and include PostScript and other - graphics formats. (This will include the file a.ps available - in the LaTeX graphics distribution.) - -exmplcol.tex - A plain TeX document using the LaTeX color package, for - producing colour. - -exmplpfg.tex - A plain TeX document using the contributed LaTeX psfrag package, - for including PostScript documents, while replacing certain text - strings with TeX typeset replacements. This uses the example.eps - figure from the psfrag 3.0 distribution. - -miniltx.tex - A small `miniLaTeX' that defines fakes or otherwise hacks - sufficient bits of LaTeX internals so that the packages can load. - -picture.tex - The user interface to the picture environment. - \input picture. - Normally a plain-style syntax is used, viz - \picture(100,100) - .... - \endpicture - - However if the command \LaTeXbegin is issued, then a LaTeX - syntax of - \begin{picture}(100,100) - .... - \end{picture} - May be used. this may be prefered if the picture is being copied - from a LaTeX document, or if it is produced automatically from - a drawing tool such as xfig or texcad. - -autopict.sty - This is a frozen copy of a file that used to be distributed with - LaTeX but is no longer needed in that context, it is basocally - the source of LaTeX Picture mode from LaTeX in 2014. The - original use for this package was to build a latex format in - which some environments such as picture and tabbing were not - defined by default, to save space if working with TeX on a - machine with 640K memory. - - -graphicx.tex - The user interface to the graphicx package. - \input graphicx - See the documentation in grfguide.ps in the LaTeX graphics - distribution. - This file sets the driver to be dvips. If you - use another driver, edit accordingly. - -color.tex - The user interface to the color package. - \input color - See the documentation in grfguide.ps in the LaTeX graphics - distribution. - This file sets the driver to be dvips. If you - use another driver, edit accordingly. - - -psfrag.tex - The user interface to the psfrag package. - \input psfrag - See the documentation in pfgguide.tex in the psfrag distribution, - and the example document pfgexmpl.tex included here. diff --git a/macros/plain/graphics/color.tex b/macros/plain/graphics/color.tex index fb8c1284ff..9c27d4300e 100644 --- a/macros/plain/graphics/color.tex +++ b/macros/plain/graphics/color.tex @@ -3,7 +3,30 @@ \input miniltx -\def\Gin@driver{dvips.def} + + +\ifx\Gin@driver\@undefined + \ifx\directlua\@undefined + \ifx\pdfoutput\@undefined + \def\Gin@driver{dvips.def} + \else + \ifnum\pdfoutput=1 + \def\Gin@driver{pdftex.def} + \else + \def\Gin@driver{dvips.def} + \fi + \fi + \else + \def\Gin@driver{luatex.def} + \fi +\fi + + + +\let\@color@protected\protected +\expandafter\@gobble\csname protected\endcsname + \input color.sty +\let\protected\@color@protected \resetatcatcode diff --git a/macros/plain/graphics/exmplgrf.tex b/macros/plain/graphics/exmplgrf.tex index d1a51b8ef1..afa8874170 100644 --- a/macros/plain/graphics/exmplgrf.tex +++ b/macros/plain/graphics/exmplgrf.tex @@ -1,9 +1,9 @@ \input graphicx -\includegraphics{a} +\includegraphics{example-image} -\includegraphics[scale=2]{a} +\includegraphics[scale=2]{example-image} hello\rotatebox[origin=c]{180}{hello}hello diff --git a/macros/plain/graphics/exmplpfg.tex b/macros/plain/graphics/exmplpfg.tex index 0026cd0ee6..0187090337 100644 --- a/macros/plain/graphics/exmplpfg.tex +++ b/macros/plain/graphics/exmplpfg.tex @@ -1,4 +1,7 @@ +% using psfrag example eps +% /usr/local/texlive/2019/texmf-dist/doc/latex/psfrag/example.eps + \input psfrag First without psfrag: diff --git a/macros/plain/graphics/graphicx.tex b/macros/plain/graphics/graphicx.tex index cbe6535769..d29c738956 100644 --- a/macros/plain/graphics/graphicx.tex +++ b/macros/plain/graphics/graphicx.tex @@ -9,9 +9,28 @@ \let\ttfamily\tt \fi -\def\Gin@driver{dvips.def} -\input graphicx.sty +\ifx\Gin@driver\@undefined + \ifx\directlua\@undefined + \ifx\pdfoutput\@undefined + \def\Gin@driver{dvips.def} + \else + \ifnum\pdfoutput=1 + \def\Gin@driver{pdftex.def} + \else + \def\Gin@driver{dvips.def} + \fi + \fi + \else + \def\Gin@driver{luatex.def} + \fi +\fi +\let\GRAPHICS@detokenize\detokenize +\ifx\detokenize\@undefined + \def\detokenize#1{#1} +\fi +\input graphicx.sty +\let\detokenize\GRAPHICS@detokenize \resetatcatcode diff --git a/macros/plain/graphics/miniltx.tex b/macros/plain/graphics/miniltx.tex index 7290959d04..814b7d7bf9 100644 --- a/macros/plain/graphics/miniltx.tex +++ b/macros/plain/graphics/miniltx.tex @@ -2,7 +2,7 @@ %%% %%% Parts of LaTeX: Slightly changed/simplified in places. %%% Changes -%%% Copyright 1996-2017 David Carlisle LaTeX3 Project +%%% Copyright 1996-2020 David Carlisle LaTeX3 Project %%% Original Code %%% Copyright 1993-1996 LaTeX3 Project and original authors %%% @@ -10,7 +10,7 @@ %%% or any other LaTeX related support address. %%% %%% Problems should be reported as issues at -%%% https://github.com/davidcarlisle/dpctex/tree/master/graphics-pln +%%% https://github.com/davidcarlisle/graphics-pln/issues %%% %%% %%% This file may be distributed under the terms of the LPPL, see @@ -25,6 +25,8 @@ % 2010/02/03 accept *-form of \ProcessOptions [KB/DL] % 2016/08/17 fix catcode @ handling (again), document github address [DC] % 2017/06/01 assorted updates to cover updated latex drivers +% 2019/07/20 more updates for latex drivers +% 2020/03/02 move to own git repository and add newcommand fix from issue #2 \edef\resetatcatcode{\catcode`\noexpand\@\the\catcode`\@\relax} @@ -115,6 +117,8 @@ \ifx#2\@empty\else\expandafter\zap@space\fi #2} +\def\strip@prefix#1>{} + \let\@empty\empty \def\@pkgextension{sty} @@ -243,6 +247,17 @@ {\def\reserved@a{\renew@command\reserved@a}}% \reserved@a}% +% Missing \x@protect definition added 2020/03/02 +\def\x@protect#1{% + \ifx\protect\@typeset@protect\else + \@x@protect#1% + \fi +} +\def\@x@protect#1\fi#2#3{% + \fi\protect#1% +} +\let\@typeset@protect\relax + \def\@ifundefined#1{% \expandafter\ifx\csname#1\endcsname\relax \expandafter\@firstoftwo @@ -509,3 +524,13 @@ % 1996/11/21 \def\@warning{\immediate\write16} + +% 2019/07/20 +\def\quote@name#1{"\quote@@name#1\@gobble""} +\def\quote@@name#1"{#1\quote@@name} +\def\unquote@name#1{\quote@@name#1\@gobble"} + +\ifx\set@curr@file\@undefined + \def\set@curr@file#1{\xdef\@curr@file{#1}} +\fi + -- cgit v1.2.3