[latex3-commits] [git/LaTeX3-latex3-latex3] master: Rename l3color-extras as l3color (26556cf)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Feb 19 10:00:33 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/26556cf28eb8dcd46dfb6860257e22bfbf93b594
>---------------------------------------------------------------
commit 26556cf28eb8dcd46dfb6860257e22bfbf93b594
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Feb 19 09:00:33 2018 +0000
Rename l3color-extras as l3color
This means moving the 'core' l3color for the present.
The logic here is that the .dtx in l3kernel is *very* basic:
the 'new' files is what most users will see as color support.
>---------------------------------------------------------------
26556cf28eb8dcd46dfb6860257e22bfbf93b594
l3experimental/l3color-extras/build.lua | 18 ------------------
.../l3color-extras/testfiles/m3color-extras000.lvt | 16 ----------------
.../l3image => l3experimental/l3color}/build.lua | 4 ++--
.../l3color-extras.dtx => l3color/l3color.dtx} | 10 +++++-----
.../l3color-extras.ins => l3color/l3color.ins} | 4 ++--
.../l3color/testfiles/m3color-extras000.lvt | 4 ++--
.../testfiles/m3color-extras000.tlg | 0
.../testfiles/m3color-extras001.lvt | 4 ++--
.../testfiles/m3color-extras001.ptex.tlg | 0
.../testfiles/m3color-extras001.tlg | 0
.../testfiles/m3color-extras001.uptex.tlg | 0
.../testfiles/m3color-extras001.xetex.tlg | 0
l3kernel/l3.ins | 5 ++---
l3kernel/{l3color.dtx => l3color-base.dtx} | 6 +++---
l3kernel/l3format.ins | 4 ++--
l3kernel/l3oldmodules.dtx | 3 +--
16 files changed, 21 insertions(+), 57 deletions(-)
diff --git a/l3experimental/l3color-extras/build.lua b/l3experimental/l3color-extras/build.lua
deleted file mode 100644
index 71f1847..0000000
--- a/l3experimental/l3color-extras/build.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env texlua
-
--- Build script for LaTeX3 "l3color-extras" files
-
--- Identify the bundle and module: the module may be empty in the case where
--- there is no subdivision
-bundle = "l3trial"
-module = "l3color-extras"
-
--- Location of main directory: use Unix-style path separators
-maindir = "../.."
-
--- Load the common build code
-dofile(maindir .. "/build-config.lua")
-
--- Find and run the build system
-kpse.set_program_name("kpsewhich")
-dofile(kpse.lookup("l3build.lua"))
diff --git a/l3experimental/l3color-extras/testfiles/m3color-extras000.lvt b/l3experimental/l3color-extras/testfiles/m3color-extras000.lvt
deleted file mode 100644
index fe0e532..0000000
--- a/l3experimental/l3color-extras/testfiles/m3color-extras000.lvt
+++ /dev/null
@@ -1,16 +0,0 @@
-%
-% Copyright (C) 2017 The LaTeX3 Project
-%
-
-\documentclass{minimal}
-\input{regression-test}
-
-\RequirePackage[check-declarations]{expl3}
-\ExplSyntaxOn
-\debug_on:n { deprecation }
-\ExplSyntaxOff
-
-\START
-\AUTHOR{Bruno Le Floch}
-\RequirePackage{l3color-extras}
-\END
diff --git a/l3trial/l3image/build.lua b/l3experimental/l3color/build.lua
similarity index 86%
copy from l3trial/l3image/build.lua
copy to l3experimental/l3color/build.lua
index 821b3fd..3f7de0d 100644
--- a/l3trial/l3image/build.lua
+++ b/l3experimental/l3color/build.lua
@@ -1,11 +1,11 @@
#!/usr/bin/env texlua
--- Build script for LaTeX3 "l3image" files
+-- Build script for LaTeX3 "l3color" files
-- Identify the bundle and module: the module may be empty in the case where
-- there is no subdivision
bundle = "l3trial"
-module = "l3image"
+module = "l3color"
-- Location of main directory: use Unix-style path separators
maindir = "../.."
diff --git a/l3experimental/l3color-extras/l3color-extras.dtx b/l3experimental/l3color/l3color.dtx
similarity index 98%
rename from l3experimental/l3color-extras/l3color-extras.dtx
rename to l3experimental/l3color/l3color.dtx
index 75d6a01..b027904 100644
--- a/l3experimental/l3color-extras/l3color-extras.dtx
+++ b/l3experimental/l3color/l3color.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3color-extras.dtx Copyright(C) 2017 The LaTeX3 Project
+%% File: l3color.dtx Copyright(C) 2017-2018 The LaTeX3 Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -32,7 +32,7 @@
% \fi
%
% \title{^^A
-% The \textsf{l3color-extras} package\\ Experimental additions to color support^^A
+% The \textsf{l3color} package\\ Experimental color support^^A
% }
%
% \author{^^A
@@ -222,7 +222,7 @@
%
% \begin{implementation}
%
-% \section{\pkg{l3color-extras} Implementation}
+% \section{\pkg{l3color} Implementation}
%
% \begin{macrocode}
%<*initex|package>
@@ -234,8 +234,8 @@
%
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage{l3color-extras}{2017/12/16}{}
- {L3 Experimental additions to color support}
+\ProvidesExplPackage{l3color}{2017/12/16}{}
+ {L3 Experimental color support}
%</package>
% \end{macrocode}
%
diff --git a/l3experimental/l3color-extras/l3color-extras.ins b/l3experimental/l3color/l3color.ins
similarity index 91%
rename from l3experimental/l3color-extras/l3color-extras.ins
rename to l3experimental/l3color/l3color.ins
index 0611c38..36da3eb 100644
--- a/l3experimental/l3color-extras/l3color-extras.ins
+++ b/l3experimental/l3color/l3color.ins
@@ -1,6 +1,6 @@
\iffalse meta-comment
-File l3color-extras.ins Copyright (C) 2017-2018 The LaTeX3 Project
+File l3color.ins Copyright (C) 2017-2018 The LaTeX3 Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -51,6 +51,6 @@ and all files in that bundle must be distributed together.
\keepsilent
-\generate{\file{l3color-extras.sty}{\from{l3color-extras.dtx}{package}}
+\generate{\file{l3color.sty}{\from{l3color.dtx}{package}}
\endbatchfile
diff --git a/l3trial/l3fp-extras/testfiles/m3fp-extras000.lvt b/l3experimental/l3color/testfiles/m3color-extras000.lvt
similarity index 73%
copy from l3trial/l3fp-extras/testfiles/m3fp-extras000.lvt
copy to l3experimental/l3color/testfiles/m3color-extras000.lvt
index 957c562..7b2154e 100644
--- a/l3trial/l3fp-extras/testfiles/m3fp-extras000.lvt
+++ b/l3experimental/l3color/testfiles/m3color-extras000.lvt
@@ -1,5 +1,5 @@
%
-% Copyright (C) 2017 The LaTeX3 Project
+% Copyright (C) 2017-2018 The LaTeX3 Project
%
\documentclass{minimal}
@@ -12,5 +12,5 @@
\START
\AUTHOR{Bruno Le Floch}
-\RequirePackage{l3fp-extras}
+\RequirePackage{l3color}
\END
diff --git a/l3experimental/l3color-extras/testfiles/m3color-extras000.tlg b/l3experimental/l3color/testfiles/m3color-extras000.tlg
similarity index 100%
rename from l3experimental/l3color-extras/testfiles/m3color-extras000.tlg
rename to l3experimental/l3color/testfiles/m3color-extras000.tlg
diff --git a/l3experimental/l3color-extras/testfiles/m3color-extras001.lvt b/l3experimental/l3color/testfiles/m3color-extras001.lvt
similarity index 97%
rename from l3experimental/l3color-extras/testfiles/m3color-extras001.lvt
rename to l3experimental/l3color/testfiles/m3color-extras001.lvt
index bfa359e..a539b8a 100644
--- a/l3experimental/l3color-extras/testfiles/m3color-extras001.lvt
+++ b/l3experimental/l3color/testfiles/m3color-extras001.lvt
@@ -1,5 +1,5 @@
%
-% Copyright (C) 2017 The LaTeX3 Project
+% Copyright (C) 2017-2018 The LaTeX3 Project
%
\documentclass{minimal}
@@ -7,7 +7,7 @@
\input{regression-test}
\RequirePackage[check-declarations,log-functions]{expl3}
-\RequirePackage{l3color-extras}
+\RequirePackage{l3color}
\START
diff --git a/l3experimental/l3color-extras/testfiles/m3color-extras001.ptex.tlg b/l3experimental/l3color/testfiles/m3color-extras001.ptex.tlg
similarity index 100%
rename from l3experimental/l3color-extras/testfiles/m3color-extras001.ptex.tlg
rename to l3experimental/l3color/testfiles/m3color-extras001.ptex.tlg
diff --git a/l3experimental/l3color-extras/testfiles/m3color-extras001.tlg b/l3experimental/l3color/testfiles/m3color-extras001.tlg
similarity index 100%
rename from l3experimental/l3color-extras/testfiles/m3color-extras001.tlg
rename to l3experimental/l3color/testfiles/m3color-extras001.tlg
diff --git a/l3experimental/l3color-extras/testfiles/m3color-extras001.uptex.tlg b/l3experimental/l3color/testfiles/m3color-extras001.uptex.tlg
similarity index 100%
rename from l3experimental/l3color-extras/testfiles/m3color-extras001.uptex.tlg
rename to l3experimental/l3color/testfiles/m3color-extras001.uptex.tlg
diff --git a/l3experimental/l3color-extras/testfiles/m3color-extras001.xetex.tlg b/l3experimental/l3color/testfiles/m3color-extras001.xetex.tlg
similarity index 100%
rename from l3experimental/l3color-extras/testfiles/m3color-extras001.xetex.tlg
rename to l3experimental/l3color/testfiles/m3color-extras001.xetex.tlg
diff --git a/l3kernel/l3.ins b/l3kernel/l3.ins
index 5433089..e2db89d 100644
--- a/l3kernel/l3.ins
+++ b/l3kernel/l3.ins
@@ -33,7 +33,7 @@ license information is placed in the derived files.
\preamble
-Copyright (C) 1990-2017 The LaTeX3 Project
+Copyright (C) 1990-2018 The LaTeX3 Project
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -97,7 +97,7 @@ and all files in that bundle must be distributed together.
\from{l3regex.dtx} {package}
\from{l3box.dtx} {package}
\from{l3coffins.dtx} {package}
- \from{l3color.dtx} {package}
+ \from{l3color-base.dtx} {package}
\from{l3sys.dtx} {package}
\from{l3deprecation.dtx}{package}
\from{l3candidates.dtx} {package}
@@ -131,7 +131,6 @@ and all files in that bundle must be distributed together.
\generate{\file{l3candidates.sty} {\from{l3oldmodules.dtx} {l3candidates,oldmodules}}}
\generate{\file{l3clist.sty} {\from{l3oldmodules.dtx} {l3clist,oldmodules}}}
\generate{\file{l3coffins.sty} {\from{l3oldmodules.dtx} {l3coffins,oldmodules}}}
-\generate{\file{l3color.sty} {\from{l3oldmodules.dtx} {l3color,oldmodules}}}
\generate{\file{l3expan.sty} {\from{l3oldmodules.dtx} {l3expan,oldmodules}}}
\generate{\file{l3file.sty} {\from{l3oldmodules.dtx} {l3file,oldmodules}}}
\generate{\file{l3fp.sty} {\from{l3oldmodules.dtx} {l3fp,oldmodules}}}
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color-base.dtx
similarity index 96%
rename from l3kernel/l3color.dtx
rename to l3kernel/l3color-base.dtx
index 9ed12f0..d3352bf 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color-base.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3color.dtx Copyright(C) 2011,2012,2014,2016,2017 The LaTeX3 Project
+%% File: l3color-base.dtx Copyright(C) 2011,2012,2014,2016-2018 The LaTeX3 Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -29,7 +29,7 @@
% \fi
%
% \title{^^A
-% The \textsf{l3color} package\\ Color support^^A
+% The \textsf{l3color-base} package\\ Color support^^A
% }
%
% \author{^^A
@@ -113,7 +113,7 @@
%
% \begin{implementation}
%
-% \section{\pkg{l3color} Implementation}
+% \section{\pkg{l3color-base} Implementation}
%
% \begin{macrocode}
%<*initex|package>
diff --git a/l3kernel/l3format.ins b/l3kernel/l3format.ins
index 7a118ac..6aa7727 100644
--- a/l3kernel/l3format.ins
+++ b/l3kernel/l3format.ins
@@ -33,7 +33,7 @@ license information is placed in the derived files.
\preamble
-Copyright (C) 1990-2017 The LaTeX3 Project
+Copyright (C) 1990-2018 The LaTeX3 Project
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -97,7 +97,7 @@ and all files in that bundle must be distributed together.
\from{l3regex.dtx} {initex}
\from{l3box.dtx} {initex}
\from{l3coffins.dtx} {initex}
- \from{l3color.dtx} {initex}
+ \from{l3color-base.dtx} {initex}
\from{l3sys.dtx} {initex}
\from{l3deprecation.dtx}{initex}
\from{l3candidates.dtx} {initex}
diff --git a/l3kernel/l3oldmodules.dtx b/l3kernel/l3oldmodules.dtx
index d24e44b..4e39978 100644
--- a/l3kernel/l3oldmodules.dtx
+++ b/l3kernel/l3oldmodules.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3oldmodules.dtx Copyright (C) 2014-2017 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014-2018 The LaTeX3 Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -92,7 +92,6 @@
%<l3candidates>{l3candidates}
%<l3clist>{l3clist}
%<l3coffins>{l3coffins}
-%<l3color>{l3color}
%<l3expan>{l3expan}
%<l3file>{l3file}
%<l3fp>{l3fp}
More information about the latex3-commits
mailing list