From 5c59ebfc8bb1cabb783923ac8f627f6982216385 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Apr 2016 21:37:33 +0000 Subject: use color.cfg and graphics.cfg from latex group; needs recent dvips.def and trig.sty git-svn-id: svn://tug.org/texlive/trunk@40269 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/graphics-cfg/README.md | 33 +++++++ Master/texmf-dist/tex/latex/graphics-cfg/color.cfg | 61 ++++++++++++ .../texmf-dist/tex/latex/graphics-cfg/graphics.cfg | 103 +++++++++++++++++++ Master/texmf-dist/tex/latex/latexconfig/color.cfg | 40 -------- .../texmf-dist/tex/latex/latexconfig/graphics.cfg | 109 --------------------- Master/tlpkg/bin/tlpkg-ctan-check | 3 +- Master/tlpkg/tlpsrc/collection-latex.tlpsrc | 1 + Master/tlpkg/tlpsrc/graphics-cfg.tlpsrc | 0 8 files changed, 200 insertions(+), 150 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/graphics-cfg/README.md create mode 100644 Master/texmf-dist/tex/latex/graphics-cfg/color.cfg create mode 100644 Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg delete mode 100644 Master/texmf-dist/tex/latex/latexconfig/color.cfg delete mode 100644 Master/texmf-dist/tex/latex/latexconfig/graphics.cfg create mode 100644 Master/tlpkg/tlpsrc/graphics-cfg.tlpsrc (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/graphics-cfg/README.md b/Master/texmf-dist/doc/latex/graphics-cfg/README.md new file mode 100644 index 00000000000..a50e3af01dc --- /dev/null +++ b/Master/texmf-dist/doc/latex/graphics-cfg/README.md @@ -0,0 +1,33 @@ +# graphics-cfg +Sample configuration files for LaTeX2e color and graphics + +Note that these files are, as far as possible, in the public domain +and may be edited to suit the distribution being used. + +Specifically they are released under the CC0 1.0 Universal licence + https://creativecommons.org/publicdomain/zero/1.0/ + + +They may be edited by end users, but more commonly should be edited +by maintainers of TeX distributions to detect a suitable range of +package options for the tex systems and dvi drivers available. + + +These color and graphics configurations will make the color and +graphics packages default option be +luatex, pdftex, vtex, xetex or dvips. +Note that pdftex option is used for luatex versions older than +luatex 0.87. + +graphics.cfg also has code to enable EPS to PDF conversion if used +with pdftex, this code may be moved to pdftex.def later. + + + +These files are currently maintained by the LaTeX3 project but +incorporating work by Thomas Esser, Heiko Oberdiek, Sebastian Rahtz, +Karl Berry and others. + +Issues and change suggestions may be raised at github: + +https://github.com/latex3/graphics-cfg/issues diff --git a/Master/texmf-dist/tex/latex/graphics-cfg/color.cfg b/Master/texmf-dist/tex/latex/graphics-cfg/color.cfg new file mode 100644 index 00000000000..fd0687958d0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/graphics-cfg/color.cfg @@ -0,0 +1,61 @@ +% https://creativecommons.org/publicdomain/zero/1.0/ + +\ProvidesFile{color.cfg}% + [2016/01/02 v1.6 sample color configuration] + +% Select an appropriate default driver +\begingroup + \chardef\x=0\relax + % check luatex + \ifx\luatexversion\@undefined + % check pdfTeX + \@ifundefined{pdfoutput}{}{% + \ifnum\pdfoutput<1 % + \else + \chardef\x=1\relax + \fi + }% + % check VTeX + \@ifundefined{OpMode}{}{% + \chardef\x=2\relax + }% + % check XeTeX + \@ifundefined{XeTeXversion}{}{% + \chardef\x=3\relax + }% + \else + \ifnum\luatexversion>85 + \ifnum\outputmode>0 + \chardef\x=4\relax + \fi + \else + \ifnum\pdfoutput>0 + \chardef\x=1\relax + \fi + \fi + \fi +\expandafter\endgroup +\ifcase\x + % default case + \def\Gin@driver{dvips.def}% + \ExecuteOptions{dvips}% +\or + % pdfTeX is running in pdf mode + \def\Gin@driver{pdftex.def}% + \ExecuteOptions{pdftex}% +\or + % VTeX is running + \def\Gin@driver{vtex.def}% + \ExecuteOptions{vtex}% +\or + % XeTeX is running + \def\Gin@driver{xetex.def}% + \ExecuteOptions{xetex}% +\or + % luatex (> 0.85) + \def\Gin@driver{luatex.def}% + \ExecuteOptions{luatex}% +\else + \PackageError{color}{Unexpected configuration}{} +\fi +\endinput diff --git a/Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg b/Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg new file mode 100644 index 00000000000..85f95c463ff --- /dev/null +++ b/Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg @@ -0,0 +1,103 @@ +% https://creativecommons.org/publicdomain/zero/1.0/ + +\ProvidesFile{graphics.cfg}% + [2016/01/02 v1.10 sample graphics configuration]% + +% Select an appropriate default driver +\begingroup + \chardef\x=0\relax + % check luatex + \ifx\luatexversion\@undefined + % check pdfTeX + \@ifundefined{pdfoutput}{}{% + \ifnum\pdfoutput<1 % + \else + \chardef\x=1\relax + \fi + }% + % check VTeX + \@ifundefined{OpMode}{}{% + \chardef\x=2\relax + }% + % check XeTeX + \@ifundefined{XeTeXversion}{}{% + \chardef\x=3\relax + }% + \else + \ifnum\luatexversion>85 + \ifnum\outputmode>0 + \chardef\x=4\relax + \fi + \else + \ifnum\pdfoutput>0 + \chardef\x=1\relax + \fi + \fi + \fi +\expandafter\endgroup +\ifcase\x + % default case + \def\Gin@driver{dvips.def}% + \ExecuteOptions{dvips}% +\or + % pdfTeX is running in pdf mode + \def\Gin@driver{pdftex.def}% + \ExecuteOptions{pdftex}% + % Load package epstopdf if + % a) LaTeX is running (plain TeX users are on their own), + % b) and shell escape (\write18) is enabled (possibly restricted), + % c) and \DoNotLoadEpstopdf either does not exist or is not \relax, + % d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). + % + % In other words, by default .eps files will be automatically + % converted to .pdf files when outputting pdf. This can be wrong! + % If the .pdf is the source, rather than the .eps, you should put + % \newcommand{\DoNotLoadEpstopdf}{} + % before even the \documentclass line of your document. + % + % More information about the epstopdf run will be in the .log file; + % see http://ctan.org/pkg/epstopdf-pkg for more info about the + % epstopdf package itself. In turn, it calls the epstopdf script + % (http://ctan.org/pkg/epstopdf). + % + % For the first discussion and background on this, see the thread on latex-l: + % http://thread.gmane.org/gmane.comp.tex.latex.latex3/1465 + % + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname DoNotLoadEpstopdf\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname AtEndOfPackage\endcsname\relax + \else + \AtEndOfPackage{% + \AtBeginDocument{% + \@ifpackageloaded{pst-pdf}{}{% + \@ifpackageloaded{pdftricks}{}{% + \RequirePackage{pdftexcmds}[2007/11/11]% + \expandafter\ifx\csname pdf@shellescape\endcsname\relax + \else + \ifnum\pdf@shellescape>0 % + \RequirePackage{epstopdf-base}[2009/07/12]% + \fi + \fi + }% pdftricks not loaded + }% pst-pdf not loaded + }% AtBeginDocument block + }% AtEndofPackage block + \fi % AtEndofPackage not defined + \fi % DoNotLoadEpstopdf not defined +\or + % VTeX is running + \def\Gin@driver{vtex.def}% + \ExecuteOptions{vtex}% +\or + % XeTeX is running + \def\Gin@driver{xetex.def}% + \ExecuteOptions{xetex}% +\or + % luatex (> 0.85) + \def\Gin@driver{luatex.def}% + \ExecuteOptions{luatex}% +\else + \PackageError{graphics}{Unexpected configuration}{} +\fi +\endinput diff --git a/Master/texmf-dist/tex/latex/latexconfig/color.cfg b/Master/texmf-dist/tex/latex/latexconfig/color.cfg deleted file mode 100644 index 0a621ce5220..00000000000 --- a/Master/texmf-dist/tex/latex/latexconfig/color.cfg +++ /dev/null @@ -1,40 +0,0 @@ -\ProvidesFile{color.cfg}% - [2007/01/18 v1.5 color configuration of teTeX/TeXLive] - -% Select an appropriate default driver -\begingroup - \chardef\x=0\relax - % check pdfTeX - \@ifundefined{pdfoutput}{}{% - \ifnum\pdfoutput<1 % - \else - \chardef\x=1\relax - \fi - }% - % check VTeX - \@ifundefined{OpMode}{}{% - \chardef\x=2\relax - }% - % check XeTeX - \@ifundefined{XeTeXversion}{}{% - \chardef\x=3\relax - }% -\expandafter\endgroup -\ifcase\x - % default case - \def\Gin@driver{dvips.def}% - \ExecuteOptions{dvips}% -\or - % pdfTeX is running in pdf mode - \def\Gin@driver{pdftex.def}% - \ExecuteOptions{pdftex}% -\or - % VTeX is running - \def\Gin@driver{vtex.def}% - \ExecuteOptions{vtex}% -\else - % XeTeX is running - \def\Gin@driver{xetex.def}% - \ExecuteOptions{xetex}% -\fi -\endinput diff --git a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg b/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg deleted file mode 100644 index c63f3211d2e..00000000000 --- a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg +++ /dev/null @@ -1,109 +0,0 @@ -% Public domain. -% Written by Thomas Esser, Heiko Oberdiek, Sebastian Rahtz, and others. -\ProvidesFile{graphics.cfg}% - [2010/04/23 v1.9 graphics configuration of TeX Live]% - -% Select an appropriate default driver -\begingroup - \chardef\x=0\relax - % check pdfTeX - \@ifundefined{pdfoutput}{}{% - \ifnum\pdfoutput<1 % - \else - \chardef\x=1\relax - \fi - }% - % check VTeX - \@ifundefined{OpMode}{}{% - \chardef\x=2\relax - }% - % check XeTeX - \@ifundefined{XeTeXversion}{}{% - \chardef\x=3\relax - }% -\expandafter\endgroup -\ifcase\x - % default case - \def\Gin@driver{dvips.def}% - \ExecuteOptions{dvips}% -\or - % pdfTeX is running in pdf mode - \def\Gin@driver{pdftex.def}% - \ExecuteOptions{pdftex}% - % Load package epstopdf if - % a) LaTeX is running (plain TeX users are on their own), - % b) and shell escape (\write18) is enabled (possibly restricted), - % c) and \DoNotLoadEpstopdf either does not exist or is not \relax, - % d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). - % - % In other words, by default .eps files will be automatically - % converted to .pdf files when outputting pdf. This can be wrong! - % If the .pdf is the source, rather than the .eps, you should put - % \newcommand{\DoNotLoadEpstopdf}{} - % before even the \documentclass line of your document. - % - % More information about the epstopdf run will be in the .log file; - % see http://ctan.org/pkg/epstopdf-pkg for more info about the - % epstopdf package itself. In turn, it calls the epstopdf script - % (http://ctan.org/pkg/epstopdf). - % - % For the first discussion and background on this, see the thread on latex-l: - % http://thread.gmane.org/gmane.comp.tex.latex.latex3/1465 - % - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname DoNotLoadEpstopdf\endcsname\relax - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname AtEndOfPackage\endcsname\relax - \else - \AtEndOfPackage{% - \AtBeginDocument{% - \@ifpackageloaded{pst-pdf}{}{% - \@ifpackageloaded{pdftricks}{}{% - \RequirePackage{pdftexcmds}[2007/11/11]% - \expandafter\ifx\csname pdf@shellescape\endcsname\relax - \else - \ifnum\pdf@shellescape>0 % - \RequirePackage{epstopdf-base}[2009/07/12]% - \fi - \fi - }% pdftricks not loaded - }% pst-pdf not loaded - }% AtBeginDocument block - }% AtEndofPackage block - \fi % AtEndofPackage not defined - \fi % DoNotLoadEpstopdf not defined -\or - % VTeX is running - \def\Gin@driver{vtex.def}% - \ExecuteOptions{vtex}% -\else - % XeTeX is running - \def\Gin@driver{xetex.def}% - \ExecuteOptions{xetex}% -\fi - -% Fix for dvips and xdvi versions that can uncompress -% graphic files without an explicite call of gunzip. -% (The fix is not applied for miniltx.tex, because -% \AtEndOfPackage is not available in plainTeX.) -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname AtEndOfPackage\endcsname\relax -\else - \AtEndOfPackage{% - \begingroup - \@ifundefined{DeclareGraphicsRule}{% - \endgroup - }{% - \def\x{dvips.def}% - \expandafter\endgroup - \ifx\x\Gin@driver - \DeclareGraphicsRule{.pz}{eps}{.bb}{}% - \DeclareGraphicsRule{.eps.Z}{eps}{.eps.bb}{}% - \DeclareGraphicsRule{.ps.Z}{eps}{.ps.bb}{}% - \DeclareGraphicsRule{.ps.gz}{eps}{.ps.bb}{}% - \DeclareGraphicsRule{.eps.gz}{eps}{.eps.bb}{}% - \fi - }% - }% -\fi -\endinput diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index b56db9aedfa..9e4d6248bd0 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -280,7 +280,8 @@ my @TLP_working = qw( glossaries-serbian glossaries-spanish gmdoc gmdoc-enhance gmiflink gmp gmutils gmverb gmverse gnuplottex go gobble gost gothic - gradientframe gradstudentresume grafcet graphbox graphics graphics-pln + gradientframe gradstudentresume grafcet graphbox graphics + graphics-cfg graphics-pln graphicx-psmin graphicxbox graphviz greek-fontenc greek-inputenc greekdates greektex greektonoi greenpoint grfpaste grid grid-system gridset grotesq grundgesetze diff --git a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc index 84498defdee..745249cbf94 100644 --- a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc @@ -17,6 +17,7 @@ depend fancyhdr depend fix2col depend geometry depend graphics +depend graphics-cfg depend hyperref depend latex depend latex-bin diff --git a/Master/tlpkg/tlpsrc/graphics-cfg.tlpsrc b/Master/tlpkg/tlpsrc/graphics-cfg.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d -- cgit v1.2.3