[latex3-commits] [git/LaTeX3-latex3-xcolor] main: driver options for issue #6 (5db140c)

[David Carlisle]

Repository : https://github.com/latex3/xcolor
On branch  : main
Link       : https://github.com/latex3/xcolor/commit/5db140cdd70fb8db3020cbfcd2a759c6e796bd97

>---------------------------------------------------------------

commit 5db140cdd70fb8db3020cbfcd2a759c6e796bd97
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Mon Oct 11 19:56:06 2021 +0100

    driver options for issue #6


>---------------------------------------------------------------

5db140cdd70fb8db3020cbfcd2a759c6e796bd97
 ChangeLog                                    |  2 ++
 testfiles/github-006.lvt                     |  9 +++++++++
 testfiles/{github-004.tlg => github-006.tlg} |  1 +
 xcolor.dtx                                   | 16 ++++++++++++----
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5de58e..30248f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ History
     - use \@backslashchar color rather than \string\color to
 	generate internal csnames, to avoid relying on the
 	current setting	of \escapechar
+    - Declare dvisvgm option to match graphics and color packages.
+       Make dvipdfm an alias for dvipdfmx	  
 	
 2016/05/11 v2.12
 * New features:
diff --git a/testfiles/github-006.lvt b/testfiles/github-006.lvt
new file mode 100644
index 0000000..7f53358
--- /dev/null
+++ b/testfiles/github-006.lvt
@@ -0,0 +1,9 @@
+\documentclass[dvisvgm]{article}
+\usepackage{xcolor}
+\input{regression-test}
+\begin{document}
+\START
+\makeatletter
+\ASSERT{\Gin at driver}{dvisvgm.def}
+\makeatother
+\END
\ No newline at end of file
diff --git a/testfiles/github-004.tlg b/testfiles/github-006.tlg
similarity index 93%
copy from testfiles/github-004.tlg
copy to testfiles/github-006.tlg
index bfbef44..6a7db11 100644
--- a/testfiles/github-004.tlg
+++ b/testfiles/github-006.tlg
@@ -1,2 +1,3 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
+PASSED
diff --git a/xcolor.dtx b/xcolor.dtx
index 307b3bf..43cb5f5 100644
--- a/xcolor.dtx
+++ b/xcolor.dtx
@@ -19,7 +19,7 @@
 %</package>
 %<*extract|driver|test1|test2|test3|test4>
 \def\XCfileversion{v2.13}%
-\def\XCfiledate{2021/09/21}%
+\def\XCfiledate{2021/10/10}%
 %</extract|driver|test1|test2|test3|test4>
 %
 % This file may be distributed and/or modified under the
@@ -377,7 +377,7 @@
 %
 % In general, there are several types of options:
 % \begin{itemize}
-% \item options that determine the color driver as explained in \cite{dpc} and \cite{color}, currently: \Option{dvips}, \Option{xdvi}, \Option{dvipdf}, \Option{dvipdfm}, \Option{dvipdfmx}, \Option{luatex}, \Option{pdftex}, \Option{dvipsone}, \Option{dviwindo}, \Option{emtex}, \Option{dviwin}, \Option{oztex}, \Option{textures}, \Option{pctexps}, \Option{pctexwin}, \Option{pctexhp}, \Option{pctex32}, \Option{truetex}, \Option{tcidvi}, \Option{vtex}, \Option{xetex},
+% \item options that determine the color driver as explained in \cite{dpc} and \cite{color}, currently: \Option{dvips}, \Option{xdvi}, \Option{dvipdf}, \Option{dvipdfm}, \Option{dvipdfmx}, \Option{luatex}, \Option{pdftex}, \Option{dvipsone}, \Option{dviwindo}, \Option{emtex}, \Option{dviwin}, \Option{oztex}, \Option{textures}, \Option{pctexps}, \Option{pctexwin}, \Option{pctexhp}, \Option{pctex32}, \Option{truetex}, \Option{tcidvi}, \Option{vtex}, \Option{xetex}, \Option{dvisvgm},
 % \item options that determine the target color model\footnote{Section \vref{sec.tgt} explains how this setting can be overridden at any point in a document.} (\Option{natural}, \Option{rgb}, \Option{cmy}, \Option{cmyk}, \Option{hsb}, \Option{gray}, \Option{RGB}, \Option{HTML}, \Option{HSB}, \Option{Gray}) or disable colored output (\Option{monochrome}),
 % \item options that control whether and how certain sets of predefined colors are being loaded: \Option{dvipsnames}, \Option{dvipsnames*}, \Option{svgnames}, \Option{svgnames*}, \Option{x11names}, \Option{x11names*},
 % \item options that determine which other packages are to be loaded or supported: \Option{table}, \Option{fixpdftex},
@@ -3145,6 +3145,13 @@
 % \subsection*{History}
 % \addcontentsline{toc}{subsection}{History}
 %
+% \subsubsection*{2021/11/10 v2.13}
+% \begin{itemize}
+% \item Bug Fixes:
+%   \begin{itemize}
+%   \item Avoid use of |\string| to generate csnames
+%   \item Declare |dvisvgm| option and make |dvipdfm| an alias to |dvipdfmx| to match graphics and color packages.
+%
 % \subsubsection*{2016/05/11 v2.12}
 % \begin{itemize}
 % \item New features:
@@ -4045,9 +4052,9 @@
 %
 % Drivers that come with their individual definition files:
 %    \begin{macrocode}
-\@tfor\@@tmp:={dvipdf}{dvipdfm}{dvipdfmx}{dvips}{dvipsone}{dviwin}%
+\@tfor\@@tmp:={dvipdf}{dvipdfmx}{dvips}{dvipsone}{dviwin}%
               {emtex}{luatex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}%
-              {tcidvi}{textures}{truetex}{vtex}{xetex}\do
+              {tcidvi}{textures}{truetex}{vtex}{xetex}{dvisvgm}\do
  {\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}%
     {\def\noexpand\Gin at driver{\@@tmp.def}}}%
   \@@tmp}
@@ -4058,6 +4065,7 @@
 \DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}}
 \DeclareOption{oztex}{\ExecuteOptions{dvips}}
 \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}}
+\DeclareOption{dvipdfm}{\ExecuteOptions{dvipdfmx}}
 %    \end{macrocode}
 %
 % Options used by (some) drivers.