diff options
author | Karl Berry <karl@freefriends.org> | 2024-04-17 19:39:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-04-17 19:39:19 +0000 |
commit | a6b1d3cfc7838e7b857d7172137903958107d540 (patch) | |
tree | 54d2acce365a1878d6cab6d8fe7054e2c62182b1 | |
parent | 1185eb4874bd1aa65d062dcde3248ed1302435f8 (diff) |
graphics-def (17apr24)
git-svn-id: svn://tug.org/texlive/trunk@70970 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/graphics-def/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/luatex.def | 17 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/pdftex.def | 17 |
3 files changed, 19 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/graphics-def/README.md b/Master/texmf-dist/doc/latex/graphics-def/README.md index c159d2e89b2..2fb6a0a73e1 100644 --- a/Master/texmf-dist/doc/latex/graphics-def/README.md +++ b/Master/texmf-dist/doc/latex/graphics-def/README.md @@ -1,7 +1,7 @@ LaTeX support for color and graphics ==================================== -Release 2022-09-22 +Release 2024-04-13 This bundle contains the 'engine-dependent' part of support for color and graphics in LaTeX2e (the code here will also function diff --git a/Master/texmf-dist/tex/latex/graphics-def/luatex.def b/Master/texmf-dist/tex/latex/graphics-def/luatex.def index b32506d0557..5c120962180 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/luatex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/luatex.def @@ -3,7 +3,7 @@ %% Hans Hagen, Heiko Oberdiek and %% Martin Schr\"oder %% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek -%% Copyright (C) 2018-2022 LaTeX3 project +%% Copyright (C) 2018-2024 LaTeX3 project %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -20,7 +20,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{luatex.def} - [2022/09/22 v1.2d Graphics/color driver for luatex] + [2024/04/13 v1.2e Graphics/color driver for luatex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -651,9 +651,8 @@ } % Load package epstopdf if % a) LaTeX is running (plain TeX users are on their own), -% b) and shell escape 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}). +% b) and \DoNotLoadEpstopdf either does not exist or is not \relax, +% c) 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! @@ -661,6 +660,10 @@ % \newcommand{\DoNotLoadEpstopdf}{} % before even the \documentclass line of your document. % +% Earlier versions did not load epstopdf if shell escape was disabled. +% Now load, for better error reporting and to allow inclusion of pre-existing +% converted files: see gh/38 +% % 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 @@ -680,11 +683,9 @@ \@ifpackageloaded{pst-pdf}{}{% \@ifpackageloaded{pdftricks}{}{% \@ifpackageloaded{graphics}{% - \ifnum\directlua{tex.sprint(status.shell_escape)}>0 % - % only add .eps to file extension list if epstopdf is loaded \edef\Gin@extensions{\Gin@extensions,.eps}% \RequirePackage{epstopdf-base}[2009/07/12]% - \fi}{} + }{} }% pdftricks not loaded }% pst-pdf not loaded \fi diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def index 35eb376cfdb..0c2afa36083 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def @@ -3,7 +3,7 @@ %% Hans Hagen, Heiko Oberdiek and %% Martin Schr\"oder %% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek -%% Copyright (C) 2018-2022 LaTeX3 project +%% Copyright (C) 2018-2024 LaTeX3 project %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -20,7 +20,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{pdftex.def} - [2022/09/22 v1.2b Graphics/color driver for pdftex] + [2024/04/13 v1.2c Graphics/color driver for pdftex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -652,9 +652,8 @@ E \else } % 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}). +% b) and \DoNotLoadEpstopdf either does not exist or is not \relax, +% c) 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! @@ -662,6 +661,10 @@ E \else % \newcommand{\DoNotLoadEpstopdf}{} % before even the \documentclass line of your document. % +% Earlier versions did not load epstopdf if shell escape was disabled. +% Now load, for better error reporting and to allow inclusion of pre-existing +% converted files: see gh/38 +% % 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 @@ -681,11 +684,9 @@ E \else \@ifpackageloaded{pst-pdf}{}{% \@ifpackageloaded{pdftricks}{}{% \@ifpackageloaded{graphics}{% - \ifnum\pdfshellescape>0 % - % only add .eps to file extension list if epstopdf is loaded \edef\Gin@extensions{\Gin@extensions,.eps}% \RequirePackage{epstopdf-base}[2009/07/12]% - \fi}{} + }{} }% pdftricks not loaded }% pst-pdf not loaded \fi |