From 626d9a4ce00942dc4f0b68f12b05ceb3ffb7e7a0 Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Wed, 28 Feb 2024 09:40:22 +0100 Subject: [PATCH 01/11] driver overwrite added --- graphics.cfg | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/graphics.cfg b/graphics.cfg index 7a6d9ac..d039a34 100644 --- a/graphics.cfg +++ b/graphics.cfg @@ -1,7 +1,21 @@ % https://creativecommons.org/publicdomain/zero/1.0/ \ProvidesFile{graphics.cfg}% - [2016/06/04 v1.11 sample graphics configuration]% + [2024/02/28 v1.12 sample graphics configuration]% + +% Using l3 would be nicer here, but this one also works with very old LaTeX +\def\Gin@DeclareEngineClashs#1{% + \@for \@tempa:=#1 \do {% + \DeclareOption{\@tempa}{% + \PackageWarningNoLine{graphics}{% + Explicte driver option \CurrentOption\space ignored,\MessageBreak + because detected engine does not support it.\MessageBreak + We recommend to remove the explicite driver option.\MessageBreak + Still staying with driver \Gin@driver + }% + }% + }% +} % Select an appropriate default driver \begingroup @@ -39,22 +53,27 @@ % default case \def\Gin@driver{dvips.def}% \ExecuteOptions{dvips}% + \Gin@DeclareEngineClashs{pdftex,vtex,xetex,luatex}% \or % pdfTeX is running in pdf mode \def\Gin@driver{pdftex.def}% \ExecuteOptions{pdftex}% + \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % VTeX is running \def\Gin@driver{vtex.def}% \ExecuteOptions{vtex}% + \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% \or % XeTeX is running \def\Gin@driver{xetex.def}% \ExecuteOptions{xetex}% + \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % luatex (> 0.85) \def\Gin@driver{luatex.def}% \ExecuteOptions{luatex}% + \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \else \PackageError{graphics}{Unexpected configuration}{} \fi From 0199aa0fc621f91a23bc696cda0b79360f515ae2 Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Wed, 28 Feb 2024 11:08:38 +0100 Subject: [PATCH 02/11] cfg for color (but not xcolor) added --- color.cfg | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/color.cfg b/color.cfg index fd06879..a140804 100644 --- a/color.cfg +++ b/color.cfg @@ -1,7 +1,23 @@ % https://creativecommons.org/publicdomain/zero/1.0/ \ProvidesFile{color.cfg}% - [2016/01/02 v1.6 sample color configuration] + [2024/02/28 v1.12 sample color configuration]% + +% Using l3 would be nicer here, but this one also works with very old LaTeX +\def\Gin@DeclareEngineClashs#1{% + \@ifpackageloaded{xcolor}{}{% + \@for \@tempa:=#1 \do {% + \DeclareOption{\@tempa}{% + \PackageWarningNoLine{color}{% + Explict driver option \CurrentOption\space ignored,\MessageBreak + because detected engine does not support it.\MessageBreak + We recommend to remove the explicit driver option.\MessageBreak + Still staying with driver \Gin@driver + }% + }% + }% + }% +} % Select an appropriate default driver \begingroup @@ -39,22 +55,27 @@ % default case \def\Gin@driver{dvips.def}% \ExecuteOptions{dvips}% + \Gin@DeclareEngineClashs{pdftex,vtex,xetex,luatex}% \or % pdfTeX is running in pdf mode \def\Gin@driver{pdftex.def}% \ExecuteOptions{pdftex}% + \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % VTeX is running \def\Gin@driver{vtex.def}% \ExecuteOptions{vtex}% + \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% \or % XeTeX is running \def\Gin@driver{xetex.def}% \ExecuteOptions{xetex}% + \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % luatex (> 0.85) \def\Gin@driver{luatex.def}% \ExecuteOptions{luatex}% + \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \else \PackageError{color}{Unexpected configuration}{} \fi From a7de53b2e2bbe5fbf73fa649ce80e382bf0c874e Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Wed, 28 Feb 2024 11:09:27 +0100 Subject: [PATCH 03/11] typofix by david --- graphics.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics.cfg b/graphics.cfg index d039a34..78cfa2a 100644 --- a/graphics.cfg +++ b/graphics.cfg @@ -8,9 +8,9 @@ \@for \@tempa:=#1 \do {% \DeclareOption{\@tempa}{% \PackageWarningNoLine{graphics}{% - Explicte driver option \CurrentOption\space ignored,\MessageBreak + Explict driver option \CurrentOption\space ignored,\MessageBreak because detected engine does not support it.\MessageBreak - We recommend to remove the explicite driver option.\MessageBreak + We recommend to remove the explicit driver option.\MessageBreak Still staying with driver \Gin@driver }% }% From 346242b5501864a394a52ff6b125a48ae2b2d40a Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Wed, 28 Feb 2024 11:20:00 +0100 Subject: [PATCH 04/11] works with xcolor --- color.cfg | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/color.cfg b/color.cfg index a140804..eb112a2 100644 --- a/color.cfg +++ b/color.cfg @@ -5,7 +5,28 @@ % Using l3 would be nicer here, but this one also works with very old LaTeX \def\Gin@DeclareEngineClashs#1{% - \@ifpackageloaded{xcolor}{}{% + \@ifpackageloaded{xcolor}{% + \@for \@@tmp:=#1 \do {% + \edef\@@tmp{% + \noexpand\DeclareKeys + { + \@@tmp .code = {% + \noexpand\PackageWarningNoLine{xcolor}{% + Explicit driver option \@@tmp\noexpand\space + ignored,\noexpand\MessageBreak + because detexted engine does not support + it.\noexpand\MessageBreak + We recommend to remove the explicit driver + option.\noexpand\MessageBreak + Still staying with driver \noexpand\Gin@driver + }% + }, + \@@tmp .usage=load + }% + }% + \@@tmp + }% + }{% \@for \@tempa:=#1 \do {% \DeclareOption{\@tempa}{% \PackageWarningNoLine{color}{% From 6d690f0484254341cb64d96957af2c139a5a808f Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Wed, 28 Feb 2024 11:23:16 +0100 Subject: [PATCH 05/11] typofix --- color.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/color.cfg b/color.cfg index eb112a2..b54b72c 100644 --- a/color.cfg +++ b/color.cfg @@ -14,7 +14,7 @@ \noexpand\PackageWarningNoLine{xcolor}{% Explicit driver option \@@tmp\noexpand\space ignored,\noexpand\MessageBreak - because detexted engine does not support + because detected engine does not support it.\noexpand\MessageBreak We recommend to remove the explicit driver option.\noexpand\MessageBreak From 82ec10ad690ab46f527e0c2f0d521fd5253d4734 Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Wed, 28 Feb 2024 11:36:45 +0100 Subject: [PATCH 06/11] fix for old xcolor --- color.cfg | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/color.cfg b/color.cfg index b54b72c..89fde3b 100644 --- a/color.cfg +++ b/color.cfg @@ -5,7 +5,8 @@ % Using l3 would be nicer here, but this one also works with very old LaTeX \def\Gin@DeclareEngineClashs#1{% - \@ifpackageloaded{xcolor}{% + \expandafter\ifnum + \@ifpackageloaded{xcolor}{\@ifpackagelater{xcolor}{2022/06/13}{\z@}{\@ne}}{\@ne}=\z@ \@for \@@tmp:=#1 \do {% \edef\@@tmp{% \noexpand\DeclareKeys @@ -26,9 +27,9 @@ }% \@@tmp }% - }{% + \else \@for \@tempa:=#1 \do {% - \DeclareOption{\@tempa}{% + \expandafter\DeclareOption\expandafter{\@tempa}{% \PackageWarningNoLine{color}{% Explict driver option \CurrentOption\space ignored,\MessageBreak because detected engine does not support it.\MessageBreak @@ -37,7 +38,7 @@ }% }% }% - }% + \fi } % Select an appropriate default driver From 27be8842f973ecf7c339215f48f9f753ba33b3de Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Wed, 28 Feb 2024 11:42:55 +0100 Subject: [PATCH 07/11] =?UTF-8?q?\Gin@DeclareEngineClashs=20=E2=86=92=20\G?= =?UTF-8?q?in@DeclareEngineClash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- color.cfg | 12 ++++++------ graphics.cfg | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/color.cfg b/color.cfg index 89fde3b..050aae5 100644 --- a/color.cfg +++ b/color.cfg @@ -4,7 +4,7 @@ [2024/02/28 v1.12 sample color configuration]% % Using l3 would be nicer here, but this one also works with very old LaTeX -\def\Gin@DeclareEngineClashs#1{% +\def\Gin@DeclareEngineClash#1{% \expandafter\ifnum \@ifpackageloaded{xcolor}{\@ifpackagelater{xcolor}{2022/06/13}{\z@}{\@ne}}{\@ne}=\z@ \@for \@@tmp:=#1 \do {% @@ -77,27 +77,27 @@ % default case \def\Gin@driver{dvips.def}% \ExecuteOptions{dvips}% - \Gin@DeclareEngineClashs{pdftex,vtex,xetex,luatex}% + \Gin@DeclareEngineClash{pdftex,vtex,xetex,luatex}% \or % pdfTeX is running in pdf mode \def\Gin@driver{pdftex.def}% \ExecuteOptions{pdftex}% - \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % VTeX is running \def\Gin@driver{vtex.def}% \ExecuteOptions{vtex}% - \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% + \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% \or % XeTeX is running \def\Gin@driver{xetex.def}% \ExecuteOptions{xetex}% - \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % luatex (> 0.85) \def\Gin@driver{luatex.def}% \ExecuteOptions{luatex}% - \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \else \PackageError{color}{Unexpected configuration}{} \fi diff --git a/graphics.cfg b/graphics.cfg index 78cfa2a..9275d23 100644 --- a/graphics.cfg +++ b/graphics.cfg @@ -4,7 +4,7 @@ [2024/02/28 v1.12 sample graphics configuration]% % Using l3 would be nicer here, but this one also works with very old LaTeX -\def\Gin@DeclareEngineClashs#1{% +\def\Gin@DeclareEngineClash#1{% \@for \@tempa:=#1 \do {% \DeclareOption{\@tempa}{% \PackageWarningNoLine{graphics}{% @@ -53,27 +53,27 @@ % default case \def\Gin@driver{dvips.def}% \ExecuteOptions{dvips}% - \Gin@DeclareEngineClashs{pdftex,vtex,xetex,luatex}% + \Gin@DeclareEngineClash{pdftex,vtex,xetex,luatex}% \or % pdfTeX is running in pdf mode \def\Gin@driver{pdftex.def}% \ExecuteOptions{pdftex}% - \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % VTeX is running \def\Gin@driver{vtex.def}% \ExecuteOptions{vtex}% - \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% + \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% \or % XeTeX is running \def\Gin@driver{xetex.def}% \ExecuteOptions{xetex}% - \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % luatex (> 0.85) \def\Gin@driver{luatex.def}% \ExecuteOptions{luatex}% - \Gin@DeclareEngineClashs{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \else \PackageError{graphics}{Unexpected configuration}{} \fi From 06563bcd04996bd03a30fee26ec265cbab135011 Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Wed, 28 Feb 2024 11:55:43 +0100 Subject: [PATCH 08/11] 'find and run' removed and installation of both cfgs --- build.lua | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/build.lua b/build.lua index be783a8..7ae66eb 100644 --- a/build.lua +++ b/build.lua @@ -3,24 +3,20 @@ -- Build script for "graphics-cfg" files -- Identify the bundle and module + bundle = "" module = "graphics-cfg" sourcefiles = - { - "color.cfg","graphics.cfg" - } -typesetfiles = - { - } + { + "color.cfg","graphics.cfg" + } +typesetfiles = + { + } -installfiles = {"graphics.cfg"} +installfiles = sourcefiles -- No automated tests for this bundle testfildir = "" - - --- Find and run the build system -kpse.set_program_name ("kpsewhich") -dofile (kpse.lookup ("l3build.lua")) From 6a40100d1bdc43ed65f0bcae459e9d4da0d6e46e Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Thu, 29 Feb 2024 09:05:44 +0100 Subject: [PATCH 09/11] works with plainTeX + miniltx --- color.cfg | 84 ++++++++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 48 deletions(-) diff --git a/color.cfg b/color.cfg index 050aae5..5f1eccd 100644 --- a/color.cfg +++ b/color.cfg @@ -3,41 +3,39 @@ \ProvidesFile{color.cfg}% [2024/02/28 v1.12 sample color configuration]% -% Using l3 would be nicer here, but this one also works with very old LaTeX -\def\Gin@DeclareEngineClash#1{% - \expandafter\ifnum - \@ifpackageloaded{xcolor}{\@ifpackagelater{xcolor}{2022/06/13}{\z@}{\@ne}}{\@ne}=\z@ - \@for \@@tmp:=#1 \do {% - \edef\@@tmp{% - \noexpand\DeclareKeys - { - \@@tmp .code = {% - \noexpand\PackageWarningNoLine{xcolor}{% - Explicit driver option \@@tmp\noexpand\space - ignored,\noexpand\MessageBreak - because detected engine does not support - it.\noexpand\MessageBreak - We recommend to remove the explicit driver - option.\noexpand\MessageBreak - Still staying with driver \noexpand\Gin@driver - }% - }, - \@@tmp .usage=load - }% - }% - \@@tmp - }% - \else - \@for \@tempa:=#1 \do {% - \expandafter\DeclareOption\expandafter{\@tempa}{% - \PackageWarningNoLine{color}{% - Explict driver option \CurrentOption\space ignored,\MessageBreak - because detected engine does not support it.\MessageBreak - We recommend to remove the explicit driver option.\MessageBreak - Still staying with driver \Gin@driver +\def\Gin@DriverOverwriteMessage#1#2{% + \PackageWarningNoLine% Question: Should we use \PackageError here? + {#1}{% + Explicit driver option #2 ignored,\MessageBreak + because detected engine does not support it.\MessageBreak + We recomment to remove the explicit driver option.\MessageBreak + Still staying with diver \Gin@driver + }{}% +} +\def\Gin@ForceDriver#1#2{% + \def\Gin@driver{#1.def}% + \ExecuteOptions{#1}% + \ifx\miniltx\undefined + \expandafter\ifnum + \@ifpackageloaded{xcolor}{\@ifpackagelater{xcolor}{2022/06/13}{\z@}{\@ne}}{\@ne}=\z@ + \@for \@@tmp:=#2 \do {% + \edef\@@tmp{% + \noexpand\DeclareKeys + { + \@@tmp .code = + \noexpand\Gin@DriverOverwriteMessage{xcolor}{\@@tmp}, + \@@tmp .usage=load + }% + }% + \@@tmp + }% + \else + \@for \@tempa:=#2 \do {% + \expandafter\DeclareOption\expandafter{\@tempa}{% + \Gin@DriverOverwriteMessage{color}{\CurrentOption}% }% }% - }% + \fi \fi } @@ -75,29 +73,19 @@ \expandafter\endgroup \ifcase\x % default case - \def\Gin@driver{dvips.def}% - \ExecuteOptions{dvips}% - \Gin@DeclareEngineClash{pdftex,vtex,xetex,luatex}% + \Gin@ForceDriver{dvips}{pdftex,vtex,xetex,luatex}% \or % pdfTeX is running in pdf mode - \def\Gin@driver{pdftex.def}% - \ExecuteOptions{pdftex}% - \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@ForceDriver{pdftex}{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % VTeX is running - \def\Gin@driver{vtex.def}% - \ExecuteOptions{vtex}% - \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% + \Gin@ForceDriver{vtex}{xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% \or % XeTeX is running - \def\Gin@driver{xetex.def}% - \ExecuteOptions{xetex}% - \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@ForceDriver{xetex}{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % luatex (> 0.85) - \def\Gin@driver{luatex.def}% - \ExecuteOptions{luatex}% - \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@ForceDriver{luatex}{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \else \PackageError{color}{Unexpected configuration}{} \fi From f80e22a8d0e9c5400fee3177a4a1973978b7c97c Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Thu, 29 Feb 2024 09:10:26 +0100 Subject: [PATCH 10/11] works with plainTeX + miniltx --- graphics.cfg | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/graphics.cfg b/graphics.cfg index 9275d23..b6e46da 100644 --- a/graphics.cfg +++ b/graphics.cfg @@ -3,18 +3,25 @@ \ProvidesFile{graphics.cfg}% [2024/02/28 v1.12 sample graphics configuration]% -% Using l3 would be nicer here, but this one also works with very old LaTeX -\def\Gin@DeclareEngineClash#1{% - \@for \@tempa:=#1 \do {% - \DeclareOption{\@tempa}{% - \PackageWarningNoLine{graphics}{% - Explict driver option \CurrentOption\space ignored,\MessageBreak - because detected engine does not support it.\MessageBreak - We recommend to remove the explicit driver option.\MessageBreak - Still staying with driver \Gin@driver +\def\Gin@DriverOverwriteMessage#1#2{% + \PackageWarningNoLine% Question: Should we use \PackageError here? + {#1}{% + Explicit driver option #2 ignored,\MessageBreak + because detected engine does not support it.\MessageBreak + We recomment to remove the explicit driver option.\MessageBreak + Still staying with diver \Gin@driver + }{}% +} +\def\Gin@ForceDriver#1#2{% + \def\Gin@driver{#1.def}% + \ExecuteOptions{#1}% + \ifx\miniltx\undefined + \@for \@tempa:=#2 \do {% + \expandafter\DeclareOption\expandafter{\@tempa}{% + \Gin@DriverOverwriteMessage{graphics}{\CurrentOption}% + }% }% - }% - }% + \fi } % Select an appropriate default driver @@ -51,29 +58,19 @@ \expandafter\endgroup \ifcase\x % default case - \def\Gin@driver{dvips.def}% - \ExecuteOptions{dvips}% - \Gin@DeclareEngineClash{pdftex,vtex,xetex,luatex}% + \Gin@ForceDriver{dvips}{pdftex,vtex,xetex,luatex}% \or % pdfTeX is running in pdf mode - \def\Gin@driver{pdftex.def}% - \ExecuteOptions{pdftex}% - \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@ForceDriver{pdftex}{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % VTeX is running - \def\Gin@driver{vtex.def}% - \ExecuteOptions{vtex}% - \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% + \Gin@ForceDriver{vtex}{xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi}% \or % XeTeX is running - \def\Gin@driver{xetex.def}% - \ExecuteOptions{xetex}% - \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@ForceDriver{xetex}{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,pdftex,luatex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \or % luatex (> 0.85) - \def\Gin@driver{luatex.def}% - \ExecuteOptions{luatex}% - \Gin@DeclareEngineClash{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% + \Gin@ForceDriver{luatex}{dvips,xdvi,dvipdf,dvipdfm,dvipdftmx,xetex,pdftex,dvisvgm,dvipsone,dviwindo,emtex,dviwin,oztex,textures,pctexwin,pctexhp,pctex32,truetex,tcidvi,vtex}% \else \PackageError{graphics}{Unexpected configuration}{} \fi From 4f095f21eb2e4b43339ea0d05cc1677f9f678d7d Mon Sep 17 00:00:00 2001 From: Markus Kohm Date: Thu, 29 Feb 2024 12:14:31 +0100 Subject: [PATCH 11/11] orphan space removed --- color.cfg | 4 ++-- graphics.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/color.cfg b/color.cfg index 5f1eccd..271d353 100644 --- a/color.cfg +++ b/color.cfg @@ -18,7 +18,7 @@ \ifx\miniltx\undefined \expandafter\ifnum \@ifpackageloaded{xcolor}{\@ifpackagelater{xcolor}{2022/06/13}{\z@}{\@ne}}{\@ne}=\z@ - \@for \@@tmp:=#2 \do {% + \@for \@@tmp:=#2\do {% \edef\@@tmp{% \noexpand\DeclareKeys { @@ -30,7 +30,7 @@ \@@tmp }% \else - \@for \@tempa:=#2 \do {% + \@for \@tempa:=#2\do {% \expandafter\DeclareOption\expandafter{\@tempa}{% \Gin@DriverOverwriteMessage{color}{\CurrentOption}% }% diff --git a/graphics.cfg b/graphics.cfg index b6e46da..4228ecb 100644 --- a/graphics.cfg +++ b/graphics.cfg @@ -16,7 +16,7 @@ \def\Gin@driver{#1.def}% \ExecuteOptions{#1}% \ifx\miniltx\undefined - \@for \@tempa:=#2 \do {% + \@for \@tempa:=#2\do {% \expandafter\DeclareOption\expandafter{\@tempa}{% \Gin@DriverOverwriteMessage{graphics}{\CurrentOption}% }%