Merge branch 'main' of https://github.com/latex3/xcolor

ChangeLog

@@ -3,6 +3,11 @@ https://github.com/latex3/xcolor/issues
 
 History
 =======
+2024/09/29 v3.02
+* remove definitions of color groups as they are already in the kernel.
+
+2024/09/17
+* unknown model error handled (issue #1)
 
 2024/03/13
 * Add \relax after \ProcessKeyOptions to improve error context lines

README.md

@@ -1,6 +1,6 @@
 ## Package `xcolor` by Dr. Uwe Kern
 
-Version 2024-03-13 v3.02
+Version 2024-09-29 v3.02
 
 Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues
 

testfiles/github-001.luatex.tlg

@@ -0,0 +1,54 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0, direction TLT
+.\hbox(0.0+0.0)x0.0, direction TLT
+..\kern-72.26999
+..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT
+...\kern-72.26999
+...\hbox(0.0+0.0)x0.0, direction TLT
+....\glue 0.0 plus 1.0fil minus 1.0fil
+...\glue 0.0 plus 1.0fil minus 1.0fil
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0, direction TLT
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil, direction TLT
+...\glue 0.0 plus 1.0fil
+...\hbox(0.0+0.0)x345.0, direction TLT
+....\pdfcolorstack 0 push {0 g 0 G}
+....\hbox(0.0+0.0)x345.0, direction TLT
+....\pdfcolorstack 0 pop
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 539.94232fil, direction TLT
+...\write-{}
+...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfcolorstack 0 push {0 0.1742 0.1742 0.74 k 0 0.1742 0.1742 0.74 K}
+...\glue(\topskip) 3.06
+...\hbox(6.94+0.11)x345.0, glue set 310.54001fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\TU/lmr/m/n/10 b
+....\TU/lmr/m/n/10 l
+....\TU/lmr/m/n/10 u
+....\TU/lmr/m/n/10 b
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -0.11
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.34
+..\hbox(6.66+0.0)x345.0, direction TLT
+...\pdfcolorstack 0 push {0 g 0 G}
+...\hbox(6.66+0.0)x345.0, glue set 170.0fil, direction TLT
+....\glue 0.0 plus 1.0fil
+....\TU/lmr/m/n/10 1
+....\glue 0.0 plus 1.0fil
+...\pdfcolorstack 0 pop
+.\kern0.0
+(github-001.aux)

testfiles/github-001.lvt

@@ -0,0 +1,10 @@
+\documentclass{article}
+\input{regression-test}
+\usepackage{xcolor}
+\begin{document}
+\START\showoutput
+\selectcolormodel{cmyk}
+\definecolor{red2}{rgb:Hsb}{0,0.67,0.26} % errors
+\color{red2}
+blub
+\end{document}

testfiles/github-001.tlg

@@ -0,0 +1,48 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\hbox(0.0+0.0)x0.0
+..\kern -72.26999
+..\vbox(0.0+0.0)x0.0, glue set 72.26999fil
+...\kern -72.26999
+...\hbox(0.0+0.0)x0.0
+....\glue 0.0 plus 1.0fil minus 1.0fil
+...\glue 0.0 plus 1.0fil minus 1.0fil
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil
+...\glue 0.0 plus 1.0fil
+...\hbox(0.0+0.0)x345.0
+....\pdfcolorstack 0 push {0 g 0 G}
+....\hbox(0.0+0.0)x345.0
+....\pdfcolorstack 0 pop
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
+...\write-{}
+...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfcolorstack 0 push {0 0.1742 0.1742 0.74 k 0 0.1742 0.1742 0.74 K}
+...\glue(\topskip) 3.05556
+...\hbox(6.94444+0.0)x345.0, glue set 310.5555fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 b
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 u
+....\OT1/cmr/m/n/10 b
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.55556
+..\hbox(6.44444+0.0)x345.0
+...\pdfcolorstack 0 push {0 g 0 G}
+...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
+....\glue 0.0 plus 1.0fil
+....\OT1/cmr/m/n/10 1
+....\glue 0.0 plus 1.0fil
+...\pdfcolorstack 0 pop
+.\kern 0.0
+(github-001.aux)

testfiles/github-001.xetex.tlg

@@ -0,0 +1,38 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil
+...\glue 0.0 plus 1.0fil
+...\hbox(0.0+0.0)x345.0
+....\special{color push gray 0}
+....\hbox(0.0+0.0)x345.0
+....\special{color pop}
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
+...\write-{}
+...\special{color push gray 0}
+...\special{color push cmyk 0 0.1742 0.1742 0.74}
+...\glue(\topskip) 3.06
+...\hbox(6.94+0.10999)x345.0, glue set 310.54fil
+....\hbox(0.0+0.0)x15.0
+....\TU/lmr/m/n/10 blub
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -0.10999
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.34
+..\hbox(6.66+0.0)x345.0
+...\special{color push gray 0}
+...\hbox(6.66+0.0)x345.0, glue set 170.0fil
+....\glue 0.0 plus 1.0fil
+....\TU/lmr/m/n/10 1
+....\glue 0.0 plus 1.0fil
+...\special{color pop}
+(github-001.aux)

testfiles/github-019b.xetex.tlg

@@ -114,6 +114,12 @@ Completed box being shipped out [1]
          <pdfaProperty:category>internal</pdfaProperty:category>
          <pdfaProperty:description>Year of standard</pdfaProperty:description>
         </rdf:li>
+        <rdf:li rdf:parseType="Resource">
+         <pdfaProperty:name>rev</pdfaProperty:name>
+         <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+         <pdfaProperty:category>internal</pdfaProperty:category>
+         <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+        </rdf:li>
        </rdf:Seq>
       </pdfaSchema:property>
      </rdf:li>
@@ -244,21 +250,11 @@ Completed box being shipped out [1]
          <pdfaProperty:description>Number of pages in the print version of the document</pdfaProperty:description>
         </rdf:li>
         <rdf:li rdf:parseType="Resource">
-         <pdfaProperty:name>subtitle</pdfaProperty:name>
-         <pdfaProperty:valueType>Text</pdfaProperty:valueType>
-         <pdfaProperty:category>external</pdfaProperty:category>
-         <pdfaProperty:description>Document's subtitle</pdfaProperty:description>
-        </rdf:li>
-       </rdf:Seq>
-      </pdfaSchema:property>
-     </rdf:li>
-    </rdf:Bag>
-   </pdfaExtension:schemas>
- \ETC.}
+         <pdfaProperty:name>subtitle</pdfaProperty:name>\ETC.}
 ..\special{pdf:docinfo<</Producer (xetex)>>}
 ..\special{pdf:docinfo<</Creator (TeX)>>}
 ..\special{pdf:docinfo<</CreationDate (D:20160520090000Z)>>}
 ..\special{pdf:docinfo<</ModDate (D:20160520090000Z)>>}
-..\special{pdf:put @catalog<</Lang (en-US)>>}
+..\special{pdf:put @catalog<</Lang (en)>>}
 ..\special{pdf:put @catalog<</Metadata @pdf.obj5>>}
 .\kern 633.0

xcolor.dtx

@@ -19,7 +19,7 @@
 %</package>
 %<*extract|driver|test1|test2|test3|test4>
 \def\XCfileversion{v3.02}%
-\def\XCfiledate{2024/03/13}%
+\def\XCfiledate{2024/09/29}%
 %</extract|driver|test1|test2|test3|test4>
 %
 % This file may be distributed and/or modified under the
@@ -320,7 +320,7 @@
 % There are proprietary models (like \Index{Pantone} or \Index{HKS}) that provide finite sets of colors (often called \emph{\Index{spot color}s}), where the user has to choose from without caring about parametrisations; on the other hand, there are parameter-driven models like \Model{gray}, \Model{rgb}, and \Model{cmyk}, that aim to represent large finite or even (theoretically) infinite sets of colors, built on very small subsets of base colors and rules, how to construct other colors from these base colors.
 % For example, a large range of colors can be constructed by linear combinations of the base colors \Color{red}, \Color{green}, and \Color{blue}.
 % On the other hand, usually \Index{spot color}s can only be \emph{approximated} by parameter values in models like \Model{cmyk} or \Model{rgb}; the original colors are being physically mixed even dependent on the targeted kind of paper.
-% Finally, there are certain colors like \Color{gold} and \Color{silver} that are hardly reproducable by any parameter-driven color model on standard ink or laser printers.
+% Finally, there are certain colors like \Color{gold} and \Color{silver} that are hardly reproducible by any parameter-driven color model on standard ink or laser printers.
 %
 %
 %
@@ -501,7 +501,7 @@
 %
 % Example: assuming that |a.tex| is a complete \LaTeX{} document, a command like
 % `|latex \def\xcolorcmd{\colorlet{black}{red}}\input{a}|'
-% at the console generates a file |a.dvi| with all occurences of \Color{black} being replaced by \Color{red}, without the necessity to change the source file itself.
+% at the console generates a file |a.dvi| with all occurrences of \Color{black} being replaced by \Color{red}, without the necessity to change the source file itself.
 % (The exact spelling of the console command might vary across operating systems and \TeX{} distributions.)
 %
 %
@@ -2487,7 +2487,7 @@
 % \subsection{Color conversion and complements}\label{sec.cnv}
 %
 % We collect here the specific conversion formulas between the supported color models.
-% Table \vref{tab.cnv} gives an overwiew of how each conversion pair is handled.
+% Table \vref{tab.cnv} gives an overview of how each conversion pair is handled.
 % In general, \Index{PostScript} (as described in \cite{plrm}) is used as a basis for most of the calculations, since it supports the color models \Model{rgb}, \Model{cmyk}, \Model{hsb}, and \Model{gray} natively.
 % Furthermore, \People{Alvy Ray}{Smith}'s paper \cite{smith} is cited in \cite{plrm} as reference for \Model{hsb}-related formulas.
 %
@@ -4275,7 +4275,7 @@
 %
 % \begin{macro}{\xglobal}
 % \begin{macro}{\xglobal@test}
-% If |\foo| occurs in the token list |\xglobal@@|, then the command |\xglobal\foo| will set the switch |\xglobal@true| which can be used inside |\foo| to determine whether certain definitions are to be made explicitely global.
+% If |\foo| occurs in the token list |\xglobal@@|, then the command |\xglobal\foo| will set the switch |\xglobal@true| which can be used inside |\foo| to determine whether certain definitions are to be made explicitly global.
 % |\foo| is responsible for resetting |\xglobal@false| in order to avoid side effects.
 % To include |\foo| in the magic list, simply say |\XC@append\xglobal@list{\foo}|.
 % If |\foo| is not in the list, |\xglobal\foo| will behave like |\global\foo|, thus |\xglobal\let| will be like |\global\let| etc.
@@ -4362,7 +4362,7 @@
 %
 % \begin{macro}{\XC@replace}
 %   \marg{cmd}\marg{search}\marg{replace}\\
-% Replace all occurences of \meta{search} within the first-level expansion of \meta{cmd} by \meta{replace} and save the result in \meta{cmd}.
+% Replace all occurrences of \meta{search} within the first-level expansion of \meta{cmd} by \meta{replace} and save the result in \meta{cmd}.
 % The replacement is recursive, so don't put the search pattern into the replacement text!
 % Note that this macro is incapable of seeing `into' braces.
 % The code and its explanation is taken from \People{Donald}{Arseneau}'s \Package{url} package \cite{url}, with only minor changes and renamings applied.
@@ -4982,9 +4982,10 @@
 % Retrieve model position |\XC@@pos|, model |\@@mod|, and target model |\@@Mod| from multiple definitions (up to~8), separated by `|/|'.
 %    \begin{macrocode}
 \def\XC@getmod#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@
- {\XC@g@tm@d0#1::\XC@@ \XC@getm@d1{#2}\XC@getm@d2{#3}%
+ {\def\XC@dflt@@mod{#1}%
+  \XC@g@tm@d0#1::\XC@@ \XC@getm@d1{#2}\XC@getm@d2{#3}%
   \XC@getm@d3{#4}\XC@getm@d4{#5}\XC@getm@d5{#6}\XC@getm@d6{#7}%
-  \XC@getm@d7{#8}\def\XC@@pos{0}\def\@@mod{#1}\@gobble\@nnil}%
+  \XC@getm@d7{#8}\def\XC@@pos{0}\let\@@mod\XC@dflt@@mod\@gobble\@nnil}%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -4996,7 +4997,10 @@
 %    \begin{macrocode}
 \def\XC@g@tm@d#1#2:#3:#4\XC@@
  {\@ifxempty{#3}{\let\@@Mod\XC@mod@ignore\XC@getm@d0{#2}}%
-    {\def\@@Mod{#2}\XC@getm@d0{#3}}}%
+    {\def\@@Mod{#2}%
+     \def\XC@tgt@mod##1{#2}%
+     \def\XC@dflt@@mod{#3}%
+     \XC@getm@d0{#3}}}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6188,11 +6192,13 @@
 %
 %
 % \subsubsection{Extra groups}
-% Turning on extra groups in the standard \LaTeX\ commands, so that color commands are scoped corectly.
 %
-% Like |\normalcolor|, the following five commands are defined in the kernel, with empty definitions (|\relax|).
+% Like |\normalcolor|, the following five commands are defined in the kernel. 
 % This means that they can be used to make macros in packages `color safe'.
-% The commands will not have any effect unless a user also uses a color package, when the `active definitions' here will take effect and keep color commands correctly scoped.
+% The extra groups have been made permanent in the \LaTeX{} kernel 2021 so
+% they are no longer redefined here.
+% The |\color@setgroup| will not have any effect unless a user also uses 
+% a color package, when the `active definition' here will take effect. 
 %
 % \begin{macro}{\color@setgroup}
 % This is to be used in contexts (e.g., `lrbox') where text is to be saved and used after some other, unknown, text that may contain color commands.
@@ -6206,38 +6212,23 @@
 % This is to be used at the start of contexts that may contain color commands, but where it is not necessary to save the current color.
 % Examples of this are in the box commands of \File{ltboxes.dtx} where user-supplied text is saved internally in a box between |\color@begingroup|, |\color@endgroup|, but the box is used before any other color commands could intervene.
 % A matching |\color@endgroup| should be used at the end of the text.
-%    \begin{macrocode}
-\let\color@begingroup\begingroup
-%    \end{macrocode}
 %  \end{macro}
 %
 %  \begin{macro}{\color@endgroup}
 % To be used to close the `group' started by one of the above two commands.
 % The |\endgraf| in its definition is required in the case of groups of text in vertical `par' mode, but doesn't do any harm in horizontal `LR' contexts.
-%    \begin{macrocode}
-\def\color@endgroup{\endgraf\endgroup}
-%    \end{macrocode}
 %  \end{macro}
 %
 %  \begin{macro}{\color@hbox}
 % To be used to open a `colored hbox'
-%    \begin{macrocode}
-\def\color@hbox{\hbox\bgroup\color@begingroup}
-%    \end{macrocode}
 %  \end{macro}
 %
 %  \begin{macro}{\color@vbox}
 % To be used to open a `colored hbox'
-%    \begin{macrocode}
-\def\color@vbox{\vbox\bgroup\color@begingroup}
-%    \end{macrocode}
 %  \end{macro}
 %
 %  \begin{macro}{\color@endbox}
 % To be used to close a `colored (h/v)box'
-%    \begin{macrocode}
-\def\color@endbox{\color@endgroup\egroup}
-%    \end{macrocode}
 %  \end{macro}
 %
 %