texlive[68864] Master/texmf-dist: xcolor (15nov23)

commits+karl at tug.org commits+karl at tug.org
Wed Nov 15 22:09:20 CET 2023


Revision: 68864
          https://tug.org/svn/texlive?view=revision&revision=68864
Author:   karl
Date:     2023-11-15 22:09:20 +0100 (Wed, 15 Nov 2023)
Log Message:
-----------
xcolor (15nov23)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog
    trunk/Master/texmf-dist/doc/latex/xcolor/README.md
    trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
    trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
    trunk/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
    trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
    trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
    trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
    trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
    trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro
    trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx
    trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def
    trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def
    trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty

Modified: trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog	2023-11-15 21:09:20 UTC (rev 68864)
@@ -3,12 +3,15 @@
 
 History
 =======
+2023/11/15 v3.01
+* only warn and not error if obsolete option usenames is used, issue #31
+
 2023/11/11 v3.00
 * If a LaTeX older than 2022-06-01 is detected a frozen version is used.
   All new features apply only if LaTeX 2022-06-01 or newer is detected.
   The frozen version can also be requested with \usepackage{xcolor}[=v2]. 
 * The new LaTeX key/val handler is used for the package options. That means there
-  will be less option clash errors, issue #29
+  will be fewer option clash errors, issue #29
 * The \rowcolors command has moved to the colortbl package
 * The fixpdftex option is obsolete and does nothing at all (issue #20)
 * Extended \normalcolor to set also the "dot" color, issue #19

Modified: trunk/Master/texmf-dist/doc/latex/xcolor/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/README.md	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/README.md	2023-11-15 21:09:20 UTC (rev 68864)
@@ -1,6 +1,6 @@
 ## Package `xcolor` by Dr. Uwe Kern
 
-Version 2023-11-11 v3.00
+Version 2023-11-15 v3.01
 
 Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues
 

Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox	2023-11-15 21:09:20 UTC (rev 68864)
@@ -26,8 +26,8 @@
 %%               2021-2023    LaTeX Project https://github.com/latex3/xcolor/issues
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v3.00}%
-\def\XCfiledate{2023/11/11}%
+\def\XCfileversion{v3.01}%
+\def\XCfiledate{2023/11/15}%
 \def\ukfile#1#2#3#4%
  {\def\ukhead
    {\ifnum#1>2 \perCent!^^J\fi

Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex	2023-11-15 21:09:20 UTC (rev 68864)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{xcolor1}
- [2023/11/11 v3.00 Color conversion test (UK)]
+ [2023/11/15 v3.01 Color conversion test (UK)]
 %%
 %% ----------------------------------------------------------------
 %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
@@ -29,8 +29,8 @@
 %%               2021-2023    LaTeX Project https://github.com/latex3/xcolor/issues
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v3.00}%
-\def\XCfiledate{2023/11/11}%
+\def\XCfileversion{v3.01}%
+\def\XCfiledate{2023/11/15}%
 
 \documentclass[a4paper]{article}
 

Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex	2023-11-15 21:09:20 UTC (rev 68864)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{xcolor2}
- [2023/11/11 v3.00 Pstricks color test (UK)]
+ [2023/11/15 v3.01 Pstricks color test (UK)]
 %%
 %% ----------------------------------------------------------------
 %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
@@ -29,8 +29,8 @@
 %%               2021-2023    LaTeX Project https://github.com/latex3/xcolor/issues
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v3.00}%
-\def\XCfiledate{2023/11/11}%
+\def\XCfileversion{v3.01}%
+\def\XCfiledate{2023/11/15}%
 
 \listfiles
 \documentclass{article}

Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex	2023-11-15 21:09:20 UTC (rev 68864)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{xcolor3}
- [2023/11/11 v3.00 Color logging test (UK)]
+ [2023/11/15 v3.01 Color logging test (UK)]
 %%
 %% ----------------------------------------------------------------
 %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
@@ -29,8 +29,8 @@
 %%               2021-2023    LaTeX Project https://github.com/latex3/xcolor/issues
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v3.00}%
-\def\XCfiledate{2023/11/11}%
+\def\XCfileversion{v3.01}%
+\def\XCfiledate{2023/11/15}%
 
 \listfiles
 \documentclass[a4paper]{article}

Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex	2023-11-15 21:09:20 UTC (rev 68864)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{xcolor4}
- [2023/11/11 v3.00 Color driver test (UK)]
+ [2023/11/15 v3.01 Color driver test (UK)]
 %%
 %% ----------------------------------------------------------------
 %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
@@ -29,8 +29,8 @@
 %%               2021-2023    LaTeX Project https://github.com/latex3/xcolor/issues
 %% ----------------------------------------------------------------
 %%
-\def\XCfileversion{v3.00}%
-\def\XCfiledate{2023/11/11}%
+\def\XCfileversion{v3.01}%
+\def\XCfiledate{2023/11/15}%
 
 \listfiles
 \documentclass[a4paper]{article}

Modified: trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro	2023-11-15 21:09:20 UTC (rev 68864)
@@ -23,7 +23,7 @@
 %% in the same archive or directory.)
 %%
 %% xcolor.pro (PostScript/dvips header file)
-%%  [2023/11/11 v3.00 LaTeX color extensions (UK)]
+%%  [2023/11/15 v3.01 LaTeX color extensions (UK)]
 %%
 %% ----------------------------------------------------------------
 %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>

Modified: trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx	2023-11-15 21:09:20 UTC (rev 68864)
@@ -18,8 +18,8 @@
 %%
 %</package>
 %<*extract|driver|test1|test2|test3|test4>
-\def\XCfileversion{v3.00}%
-\def\XCfiledate{2023/11/11}%
+\def\XCfileversion{v3.01}%
+\def\XCfiledate{2023/11/15}%
 %</extract|driver|test1|test2|test3|test4>
 %
 % This file may be distributed and/or modified under the
@@ -3143,11 +3143,15 @@
 %
 % \subsection*{History}
 % \addcontentsline{toc}{subsection}{History}
+% \subsubsection*{2023/11/15 v3.01}
+% \begin{itemize}
+% \item only warn and not error if obsolete option usenames is used (issue \#31)
+% \end{itemize}
 % \subsubsection*{2023/11/11 v3.00}
 % \begin{itemize}
 % \item if a \LaTeX{} older than 2022-06-01 is detected a frozen version is used.
 %  All new features apply only if LaTeX 2022-06-01 or newer is detected.
-%  The frozen version can also be requested with \verb+\usepackage{xcolor}[=v2]+  
+%  The frozen version can also be requested with \verb+\usepackage{xcolor}[=v2]+
 % \item  The new LaTeX key/val handler is used for the package options.
 % That means there will be fewer option clash errors (issue \#29).
 % item  The |\rowcolors| command has moved to the |colortbl| package and is no longer
@@ -3156,7 +3160,7 @@
 % \item Extended |\normalcolor| to set also the dot color, issue \#19
 % \item Fix Gray color model, issue \#23
 % \end{itemize}
-% 
+%
 % \subsubsection*{2022/06/12 v2.14}
 % \begin{itemize}
 % \item Load code from \LaTeX\ to define |\mathcolor| if it is available.
@@ -3163,8 +3167,8 @@
 % \item Bug fixes:
 %   \begin{itemize}
 %   \item Modify |\XC at info| to avoid spurious error from |\colorlet{foo}{}|, issue \#12
-%   \item make |\normalcolor|, |\colorbox|, |\fcolorbox|, |\textcolor|, |\pagecolor|, 
-%      |\nopagecolor|, |\definecolor|, |\DefineNamedColor| 
+%   \item make |\normalcolor|, |\colorbox|, |\fcolorbox|, |\textcolor|, |\pagecolor|,
+%      |\nopagecolor|, |\definecolor|, |\DefineNamedColor|
 %      protected as in |color.sty|, issue \#17
 %   \end{itemize}
 % \end{itemize}
@@ -4031,17 +4035,9 @@
  {
     table .code  ={\AddToHook{package/xcolor/after}{\RequirePackage{colortbl}}}
    ,table .usage = preamble
-%    \end{macrocode}
-%
-% These options are obsolete and only added for compatibility.
-%    \begin{macrocode}
-   ,hyperref  .code = {}
-   ,fixpdftex .code = {}
  }
 %    \end{macrocode}
 %
-%
-%
 % \subsubsection{Driver options}
 %
 % \begin{macro}{\Gin at driver}
@@ -4115,8 +4111,26 @@
   }
 %    \end{macrocode}
 %
-% All other options (including \LC's \oOption{usenames}, \oOption{nodvipsnames}) error.
+% \subsubsection{Obsolete options}
+% The following options are obsolete but perhaps still around in the wild,
+% so we generate a warning.
+%    \begin{macrocode}
+\DeclareKeys
+ {
+   ,usenames   .code    =
+     {\PackageWarning{xcolor}{Package option `usenames' is obsolete and ignored}}
+   ,usename    .usage   = preamble
+   ,hyperref   .code    =
+     {\PackageWarning{xcolor}{Package option `hyperref' is obsolete and ignored}}
+   ,hyperref   .usage   = preamble
+   ,fixpdftex  .code    =
+     {\PackageWarning{xcolor}{Package option `fixpdftex' is obsolete and ignored}}
+   ,fixpdftex  .usage   = preamble
+ }
+%    \end{macrocode}
 %
+% All other options (including \LC's \oOption{nodvipsnames}) error.
+%
 % Choose default options:
 %    \begin{macrocode}
 \def\XC@@xcd@{-1}
@@ -4125,7 +4139,6 @@
 \SetKeys{natural,showerrors}
 %    \end{macrocode}
 %
-%
 % \subsubsection{Processing options}
 %
 % A local configuration file may declare more options.

Modified: trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def	2023-11-15 21:09:20 UTC (rev 68864)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{svgnam.def}
- [2023/11/11 v3.00 Predefined colors according to SVG 1.1 (UK)]
+ [2023/11/15 v3.01 Predefined colors according to SVG 1.1 (UK)]
 %%
 %% ----------------------------------------------------------------
 %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>

Modified: trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def	2023-11-15 21:09:20 UTC (rev 68864)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 \ProvidesFile{x11nam.def}
- [2023/11/11 v3.00 Predefined colors according to Unix/X11 (UK)]
+ [2023/11/15 v3.01 Predefined colors according to Unix/X11 (UK)]
 %%
 %% ----------------------------------------------------------------
 %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>

Modified: trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty	2023-11-15 21:09:01 UTC (rev 68863)
+++ trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty	2023-11-15 21:09:20 UTC (rev 68864)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 \ProvidesPackage{xcolor}
- [2023/11/11 v3.00 LaTeX color extensions (UK)]
+ [2023/11/15 v3.01 LaTeX color extensions (UK)]
 %%
 %% ----------------------------------------------------------------
 %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
@@ -201,8 +201,6 @@
  {
     table .code  ={\AddToHook{package/xcolor/after}{\RequirePackage{colortbl}}}
    ,table .usage = preamble
-   ,hyperref  .code = {}
-   ,fixpdftex .code = {}
  }
 \providecommand*\Gin at driver{}
 \@tfor\@@tmp:={dvipdf}{dvipdfmx}{dvips}{dvipsone}{dviwin}%
@@ -242,6 +240,18 @@
    ,hideerrors .code   = {\colorerrors at false}
    ,debugshow .code    = {\catcode`\^^A=9 \let\GDebug\typeout}
   }
+\DeclareKeys
+ {
+   ,usenames   .code    =
+     {\PackageWarning{xcolor}{Package option `usenames' is obsolete and ignored}}
+   ,usename    .usage   = preamble
+   ,hyperref   .code    =
+     {\PackageWarning{xcolor}{Package option `hyperref' is obsolete and ignored}}
+   ,hyperref   .usage   = preamble
+   ,fixpdftex  .code    =
+     {\PackageWarning{xcolor}{Package option `fixpdftex' is obsolete and ignored}}
+   ,fixpdftex  .usage   = preamble
+ }
 \def\XC@@xcd@{-1}
 \def\XC@@xcf@{-1}
 \def\XC@@xcp@{-1}



More information about the tex-live-commits mailing list.