[latex3-commits] [l3svn] r7376 - Correct docstrip guards for old modules, also generate l3tl-build.sty
noreply at latex-project.org
noreply at latex-project.org
Sun Jul 16 05:49:23 CEST 2017
Author: bruno
Date: 2017-07-16 05:49:23 +0200 (Sun, 16 Jul 2017)
New Revision: 7376
Modified:
trunk/l3kernel/l3.ins
trunk/l3kernel/l3oldmodules.dtx
trunk/l3kernel/source3body.tex
trunk/l3kernel/testfiles/m3expl005.lvt
trunk/l3kernel/testfiles/m3expl005.tlg
Log:
Correct docstrip guards for old modules, also generate l3tl-build.sty
See https://tex.stackexchange.com/questions/380492 (probably some package
loaded l3tl-build directly, now broken due to move to l3kernel).
Modified: trunk/l3kernel/l3.ins
===================================================================
--- trunk/l3kernel/l3.ins 2017-07-15 22:09:40 UTC (rev 7375)
+++ trunk/l3kernel/l3.ins 2017-07-16 03:49:23 UTC (rev 7376)
@@ -149,6 +149,7 @@
\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
Modified: trunk/l3kernel/l3oldmodules.dtx
===================================================================
--- trunk/l3kernel/l3oldmodules.dtx 2017-07-15 22:09:40 UTC (rev 7375)
+++ trunk/l3kernel/l3oldmodules.dtx 2017-07-16 03:49:23 UTC (rev 7376)
@@ -110,6 +110,7 @@
%<l3str>{l3str}
%<l3tl>{l3tl}
%<l3tl-analysis>{l3tl-analysis}
+%<l3tl-build>{l3tl-build}
%<l3token>{l3token}
% \end{macrocode}
%
@@ -129,20 +130,20 @@
\typeout{** }
\typeout{** Its functionality is now only provided as part of the expl3 package.}
\typeout{** }
-%<!l3regex|l3sort|l3tl-analysis>\typeout{** After showing you an error message you can hit <return> we will continue}
-%<!l3regex|l3sort|l3tl-analysis>\typeout{** for now by loading expl3 for you. However, the old packages will be}
-%<!l3regex|l3sort|l3tl-analysis>\typeout{** removed entirely at the end of 2017.}
-%<l3regex|l3sort|l3tl-analysis>\typeout{** The old packages will be removed entirely at the end of 2018.}
+%<!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{** }
\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>\PackageError
-%<l3regex|l3sort|l3tl-analysis>\PackageWarning
+%<!l3regex&!l3sort&!l3tl-analysis&!l3tl-build>\PackageError
+%<l3regex|l3sort|l3tl-analysis|l3tl-build>\PackageWarning
\old at liii@module at name{This package is obsolete ---
use 'expl3' instead}
-%<!l3regex|l3sort|l3tl-analysis> \@ehc
+%<!l3regex&!l3sort&!l3tl-analysis&!l3tl-build> \@ehc
% \end{macrocode}
% Finally load \texttt{expl3} so that the user can continue for now.
% \begin{macrocode}
Modified: trunk/l3kernel/source3body.tex
===================================================================
--- trunk/l3kernel/source3body.tex 2017-07-15 22:09:40 UTC (rev 7375)
+++ trunk/l3kernel/source3body.tex 2017-07-16 03:49:23 UTC (rev 7376)
@@ -453,8 +453,8 @@
\ExplSyntaxOff
\DocInput{l3sort.dtx}
+\DocInput{l3tl-build.dtx}
\DocInput{l3tl-analysis.dtx}
-\DocInput{l3tl-build.dtx}
\DocInput{l3regex.dtx}
\DocInput{l3box.dtx}
\DocInput{l3coffins.dtx}
Modified: trunk/l3kernel/testfiles/m3expl005.lvt
===================================================================
--- trunk/l3kernel/testfiles/m3expl005.lvt 2017-07-15 22:09:40 UTC (rev 7375)
+++ trunk/l3kernel/testfiles/m3expl005.lvt 2017-07-16 03:49:23 UTC (rev 7376)
@@ -1,5 +1,5 @@
%
-% Copyright (C) 2014 The LaTeX3 Project
+% Copyright (C) 2014,2017 The LaTeX3 Project
%
\documentclass{minimal}
@@ -33,5 +33,11 @@
\usepackage{l3skip}
\usepackage{l3tl}
\usepackage{l3token}
+
+\usepackage{l3regex}
+\usepackage{l3sort}
+\usepackage{l3tl-analysis}
+\usepackage{l3tl-build}
+
\END
Modified: trunk/l3kernel/testfiles/m3expl005.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl005.tlg 2017-07-15 22:09:40 UTC (rev 7375)
+++ trunk/l3kernel/testfiles/m3expl005.tlg 2017-07-16 03:49:23 UTC (rev 7376)
@@ -483,4 +483,64 @@
Try typing <return> to proceed.
If that doesn't work, type X <return> to quit.
----> This would load expl3
+) (l3regex.sty
+*****************************************************************
+**
+** Package l3regex is obsolete and has been removed!
+**
+** Its functionality is now only provided as part of the expl3 package.
+**
+** The old packages will be removed entirely at the end of 2018.
+**
+** Therefore, please replace '\usepackage{l3regex}'
+** with '\usepackage{expl3}' in your documents as soon as possible.
+**
+*******************************************************************
+Package l3regex Warning: This package is obsolete --- use 'expl3' instead on input line ....
+----> This would load expl3
+) (l3sort.sty
+*****************************************************************
+**
+** Package l3sort is obsolete and has been removed!
+**
+** Its functionality is now only provided as part of the expl3 package.
+**
+** The old packages will be removed entirely at the end of 2018.
+**
+** Therefore, please replace '\usepackage{l3sort}'
+** with '\usepackage{expl3}' in your documents as soon as possible.
+**
+*******************************************************************
+Package l3sort Warning: This package is obsolete --- use 'expl3' instead on input line ....
+----> This would load expl3
+) (l3tl-analysis.sty
+*****************************************************************
+**
+** Package l3tl-analysis is obsolete and has been removed!
+**
+** Its functionality is now only provided as part of the expl3 package.
+**
+** The old packages will be removed entirely at the end of 2018.
+**
+** Therefore, please replace '\usepackage{l3tl-analysis}'
+** with '\usepackage{expl3}' in your documents as soon as possible.
+**
+*******************************************************************
+Package l3tl-analysis Warning: This package is obsolete --- use 'expl3' instead on input line ....
+----> This would load expl3
+) (l3tl-build.sty
+*****************************************************************
+**
+** Package l3tl-build is obsolete and has been removed!
+**
+** Its functionality is now only provided as part of the expl3 package.
+**
+** The old packages will be removed entirely at the end of 2018.
+**
+** Therefore, please replace '\usepackage{l3tl-build}'
+** with '\usepackage{expl3}' in your documents as soon as possible.
+**
+*******************************************************************
+Package l3tl-build Warning: This package is obsolete --- use 'expl3' instead on input line ....
+----> This would load expl3
)
More information about the latex3-commits
mailing list