[latex3-commits] [git/LaTeX3-latex3-latex3] master: Old module cull (13273d7)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/13273d75f4ed3a7a57906da7110913b31c8071a5

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

commit 13273d75f4ed3a7a57906da7110913b31c8071a5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Mar 5 16:37:54 2018 +0000

    Old module cull
    
    We said we'd remove them: should really follow through.


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

13273d75f4ed3a7a57906da7110913b31c8071a5
 l3kernel/l3.ins           |   20 --------------------
 l3kernel/l3oldmodules.dtx |   29 ++---------------------------
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/l3kernel/l3.ins b/l3kernel/l3.ins
index e2df5ff..244c385 100644
--- a/l3kernel/l3.ins
+++ b/l3kernel/l3.ins
@@ -125,31 +125,11 @@ and all files in that bundle must be distributed together.
 
 % old modules generating a usage error:
 
-\generate{\file{l3basics.sty}     {\from{l3oldmodules.dtx}       {l3basics,oldmodules}}}
-\generate{\file{l3bootstrap.sty}  {\from{l3oldmodules.dtx}       {l3bootstrap,oldmodules}}}
-\generate{\file{l3box.sty}        {\from{l3oldmodules.dtx}       {l3box,oldmodules}}}
-\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{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}}}
-\generate{\file{l3int.sty}        {\from{l3oldmodules.dtx}       {l3int,oldmodules}}}
-\generate{\file{l3keys.sty}       {\from{l3oldmodules.dtx}       {l3keys,oldmodules}}}
-\generate{\file{l3msg.sty}        {\from{l3oldmodules.dtx}       {l3msg,oldmodules}}}
-\generate{\file{l3names.sty}      {\from{l3oldmodules.dtx}       {l3names,oldmodules}}}
-\generate{\file{l3prg.sty}        {\from{l3oldmodules.dtx}       {l3prg,oldmodules}}}
-\generate{\file{l3prop.sty}       {\from{l3oldmodules.dtx}       {l3prop,oldmodules}}}
-\generate{\file{l3quark.sty}      {\from{l3oldmodules.dtx}       {l3quark,oldmodules}}}
 \generate{\file{l3regex.sty}      {\from{l3oldmodules.dtx}       {l3regex,oldmodules}}}
-\generate{\file{l3seq.sty}        {\from{l3oldmodules.dtx}       {l3seq,oldmodules}}}
-\generate{\file{l3skip.sty}       {\from{l3oldmodules.dtx}       {l3skip,oldmodules}}}
 \generate{\file{l3sort.sty}       {\from{l3oldmodules.dtx}       {l3sort,oldmodules}}}
 \generate{\file{l3str.sty}        {\from{l3oldmodules.dtx}       {l3str,oldmodules}}}
-\generate{\file{l3tl.sty}         {\from{l3oldmodules.dtx}       {l3tl,oldmodules}}}
 \generate{\file{l3tl-analysis.sty}{\from{l3oldmodules.dtx}       {l3tl-analysis,oldmodules}}}
 \generate{\file{l3tl-build.sty}   {\from{l3oldmodules.dtx}       {l3tl-build,oldmodules}}}
-\generate{\file{l3token.sty}      {\from{l3oldmodules.dtx}       {l3token,oldmodules}}}
 
 % Lua code
 
diff --git a/l3kernel/l3oldmodules.dtx b/l3kernel/l3oldmodules.dtx
index 3577138..2278a27 100644
--- a/l3kernel/l3oldmodules.dtx
+++ b/l3kernel/l3oldmodules.dtx
@@ -86,31 +86,11 @@
 %    \begin{macrocode}
 %<*oldmodules>
 \def\old at liii@module at name
-%<l3basics>{l3basics}
-%<l3bootstrap>{l3bootstrap}
-%<l3box>{l3box}
-%<l3candidates>{l3candidates}
-%<l3clist>{l3clist}
-%<l3coffins>{l3coffins}
-%<l3expan>{l3expan}
-%<l3file>{l3file}
-%<l3fp>{l3fp}
-%<l3int>{l3int}
-%<l3keys>{l3keys}
-%<l3msg>{l3msg}
-%<l3names>{l3names}
-%<l3prg>{l3prg}
-%<l3prop>{l3prop}
-%<l3quark>{l3quark}
 %<l3regex>{l3regex}
-%<l3seq>{l3seq}
-%<l3skip>{l3skip}
 %<l3sort>{l3sort}
 %<l3str>{l3str}
-%<l3tl>{l3tl}
 %<l3tl-analysis>{l3tl-analysis}
 %<l3tl-build>{l3tl-build}
-%<l3token>{l3token}
 %    \end{macrocode}
 %
 %    Then identify the current package:
@@ -129,20 +109,15 @@
 \typeout{** }
 \typeout{** Its functionality is now only provided as part of the expl3 package.}
 \typeout{** }
-%<!l3regex&!l3sort&!l3tl-analysis&!l3tl-build>\typeout{** After showing you an error message you can hit <return> we will continue}
-%<!l3regex&!l3sort&!l3tl-analysis&!l3tl-build>\typeout{** for now by loading expl3 for you. However, the old packages will be}
-%<!l3regex&!l3sort&!l3tl-analysis&!l3tl-build>\typeout{** removed entirely at the end of 2017.}
-%<l3regex|l3sort|l3tl-analysis|l3tl-build>\typeout{** The old packages will be removed entirely at the end of 2018.}
+\typeout{** The old packages will be removed entirely at the end of 2018.}
 \typeout{** }
 \typeout{** Therefore, please replace '\string\usepackage{\old at liii@module at name}'}
 \typeout{** with '\string\usepackage{expl3}' in your documents as soon as possible.}
 \typeout{** }
 \typeout{*******************************************************************}
-%<!l3regex&!l3sort&!l3tl-analysis&!l3tl-build>\PackageError
-%<l3regex|l3sort|l3tl-analysis|l3tl-build>\PackageWarning
+\PackageWarning
   \old at liii@module at name{This package is obsolete ---
    use 'expl3' instead}
-%<!l3regex&!l3sort&!l3tl-analysis&!l3tl-build>  \@ehc
 %    \end{macrocode}
 %    Finally load \texttt{expl3} so that the user can continue for now.
 %    \begin{macrocode}