[latex3-commits] [latex3/xcolor] main: handle issue #1 (#38) (6b59492)
github at latex-project.org
github at latex-project.org
Sun Sep 29 00:38:50 CEST 2024
Repository : https://github.com/latex3/xcolor
On branch : main
Link : https://github.com/latex3/xcolor/commit/6b59492f80502b70f3f06e394f14a81cbf767a37
>---------------------------------------------------------------
commit 6b59492f80502b70f3f06e394f14a81cbf767a37
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Sun Sep 29 00:38:50 2024 +0200
handle issue #1 (#38)
* handle issue #1
* remove unneeded color group commands
* step version
>---------------------------------------------------------------
6b59492f80502b70f3f06e394f14a81cbf767a37
ChangeLog | 5 ++++
README.md | 2 +-
testfiles/github-001.luatex.tlg | 54 +++++++++++++++++++++++++++++++++++++++++
testfiles/github-001.lvt | 10 ++++++++
testfiles/github-001.tlg | 48 ++++++++++++++++++++++++++++++++++++
testfiles/github-001.xetex.tlg | 38 +++++++++++++++++++++++++++++
testfiles/github-019b.xetex.tlg | 20 ++++++---------
xcolor.dtx | 34 +++++++++++---------------
8 files changed, 178 insertions(+), 33 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d09ca4f..3f8ffd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ https://github.com/latex3/xcolor/issues
History
=======
+2024/09/29
+* 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
diff --git a/README.md b/README.md
index e15feba..d18ce53 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
## Package `xcolor` by Dr. Uwe Kern
-Version 2024-03-13 v3.02
+Version 2024-09-29 v3.04
Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues
diff --git a/testfiles/github-001.luatex.tlg b/testfiles/github-001.luatex.tlg
new file mode 100644
index 0000000..6eb2a83
--- /dev/null
+++ b/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)
diff --git a/testfiles/github-001.lvt b/testfiles/github-001.lvt
new file mode 100644
index 0000000..52f8a5e
--- /dev/null
+++ b/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}
diff --git a/testfiles/github-001.tlg b/testfiles/github-001.tlg
new file mode 100644
index 0000000..34ede87
--- /dev/null
+++ b/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)
diff --git a/testfiles/github-001.xetex.tlg b/testfiles/github-001.xetex.tlg
new file mode 100644
index 0000000..4f5f8d5
--- /dev/null
+++ b/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)
diff --git a/testfiles/github-019b.xetex.tlg b/testfiles/github-019b.xetex.tlg
index edc76fd..0c73f65 100644
--- a/testfiles/github-019b.xetex.tlg
+++ b/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
diff --git a/xcolor.dtx b/xcolor.dtx
index e6e0537..5081f30 100644
--- a/xcolor.dtx
+++ b/xcolor.dtx
@@ -18,8 +18,8 @@
%%
%</package>
%<*extract|driver|test1|test2|test3|test4>
-\def\XCfileversion{v3.02}%
-\def\XCfiledate{2024/03/13}%
+\def\XCfileversion{v3.04}%
+\def\XCfiledate{2024/09/29}%
%</extract|driver|test1|test2|test3|test4>
%
% This file may be distributed and/or modified under the
@@ -4981,9 +4981,10 @@
% Retrieve model position |\XC@@pos|, model |\@@mod|, and target model |\@@Mod| from multiple definitions (up to~8), separated by `|/|'.
% \begin{macrocode}
\def\XC at getmod#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@
- {\XC at g@tm at d0#1::\XC@@ \XC at getm@d1{#2}\XC at getm@d2{#3}%
+ {\def\XC at dflt@@mod{#1}%
+ \XC at g@tm at d0#1::\XC@@ \XC at getm@d1{#2}\XC at getm@d2{#3}%
\XC at getm@d3{#4}\XC at getm@d4{#5}\XC at getm@d5{#6}\XC at getm@d6{#7}%
- \XC at getm@d7{#8}\def\XC@@pos{0}\def\@@mod{#1}\@gobble\@nnil}%
+ \XC at getm@d7{#8}\def\XC@@pos{0}\let\@@mod\XC at dflt@@mod\@gobble\@nnil}%
% \end{macrocode}
%
% \begin{macrocode}
@@ -4995,7 +4996,10 @@
% \begin{macrocode}
\def\XC at g@tm at d#1#2:#3:#4\XC@@
{\@ifxempty{#3}{\let\@@Mod\XC at mod@ignore\XC at getm@d0{#2}}%
- {\def\@@Mod{#2}\XC at getm@d0{#3}}}%
+ {\def\@@Mod{#2}%
+ \def\XC at tgt@mod##1{#2}%
+ \def\XC at dflt@@mod{#3}%
+ \XC at getm@d0{#3}}}%
% \end{macrocode}
% \end{macro}
%
@@ -6187,11 +6191,13 @@
%
%
% \subsubsection{Extra groups}
-% Turning on extra groups in the standard \LaTeX\ commands, so that color commands are scoped correctly.
%
-% 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 at 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 at 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.
@@ -6205,31 +6211,19 @@
% 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 at begingroup|, |\color at endgroup|, but the box is used before any other color commands could intervene.
% A matching |\color at endgroup| should be used at the end of the text.
-% \begin{macrocode}
-\let\color at begingroup\begingroup
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\color at 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 at endgroup{\endgraf\endgroup}
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\color at hbox}
% To be used to open a `colored hbox'
-% \begin{macrocode}
-\def\color at hbox{\hbox\bgroup\color at begingroup}
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\color at vbox}
% To be used to open a `colored hbox'
-% \begin{macrocode}
-\def\color at vbox{\vbox\bgroup\color at begingroup}
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\color at endbox}
More information about the latex3-commits
mailing list.