[latex3-commits] [git/LaTeX3-latex3-latex3] l3doc: allow both l3doc dtx files to compile (8bc9a4318)

[Will Robertson]

Repository : https://github.com/latex3/latex3
On branch  : l3doc
Link       : https://github.com/latex3/latex3/commit/8bc9a43183d1fde330652f44e0565e5d7392db04

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

commit 8bc9a43183d1fde330652f44e0565e5d7392db04
Author: Will Robertson <wspr81 at gmail.com>
Date:   Tue Sep 24 02:50:26 2019 +0930

    allow both l3doc dtx files to compile


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

8bc9a43183d1fde330652f44e0565e5d7392db04
 l3kernel/l3doc-cls.dtx | 19 ++++++++++---------
 l3kernel/l3doc-pkg.dtx | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/l3kernel/l3doc-cls.dtx b/l3kernel/l3doc-cls.dtx
index b6b725933..7cd4acf90 100644
--- a/l3kernel/l3doc-cls.dtx
+++ b/l3kernel/l3doc-cls.dtx
@@ -32,7 +32,7 @@
 \documentclass{l3doc}
 \usepackage{framed,lipsum}
 \begin{document}
-  \DocInput{l3doc.dtx}
+  \DocInput{l3doc-cls.dtx}
 \end{document}
 %</driver>
 %
@@ -544,7 +544,7 @@
 %
 % \subsection{Class options and configuration}
 %
-% Make the \opt{a5paper} option raise an error.
+% Make the \texttt{a5paper} option raise an error.
 %    \begin{macrocode}
 \DeclareOption { a5paper } { \@latexerr { Option~not~supported } { } }
 %    \end{macrocode}
@@ -578,7 +578,7 @@
 % All remaining options are passed to the base \cls{article} class.
 %    \begin{macrocode}
 \DeclareOption* { \PassOptionsToClass { \CurrentOption } { article } }
-\ExecuteOptions { lm-default }
+\ExecuteOptions { lm-default , full , kernel , nocheck , nochecktest }
 \PassOptionsToClass { a4paper } { article }
 %    \end{macrocode}
 %
@@ -592,11 +592,9 @@
   { Local~config~file~l3doc.cfg~loaded. }
 \file_if_exist:nT { l3doc.cfg }
   {
-    \file_input:nT { l3doc.cfg }
-      {
-        \cs_if_exist:NF \ExplMakeTitle
-          { \msg_info:nn { l3doc } { input-cfg } }
-      }
+    \file_input:n { l3doc.cfg }
+    \cs_if_exist:NF \ExplMakeTitle
+      { \msg_info:nn { l3doc } { input-cfg } }
   }
 %    \end{macrocode}
 %
@@ -722,9 +720,12 @@
 %
 % Now load the \pkg{l3doc} package to do the heavy-lifting.
 %    \begin{macrocode}
-\RequirePackage [ full , kernel , nocheck , nochecktest ] { l3doc }
+\RequirePackage { l3doc }
 %    \end{macrocode}
 %
+%    \begin{macrocode}
+%</class>
+%    \end{macrocode}
 %
 % \subsection{Internal macros for \LaTeX3 sources}
 %
diff --git a/l3kernel/l3doc-pkg.dtx b/l3kernel/l3doc-pkg.dtx
index d867655ae..db0449736 100644
--- a/l3kernel/l3doc-pkg.dtx
+++ b/l3kernel/l3doc-pkg.dtx
@@ -27,11 +27,21 @@
 %</driver|package>
 %<*driver>
 \documentclass[full]{l3doc}
+\usepackage{framed}
 \begin{document}
   \DocInput{\jobname.dtx}
 \end{document}
 %</driver>
 %
+% This isn't included in the typeset documentation because it's a bit
+% ugly:
+% ^^A Why? --Phelype
+%<*package>
+\ProvidesExplPackage{l3doc}{2019-08-27}{}
+  {L3 Experimental documentation package}
+%</package>
+% \fi
+%
 % \title{^^A
 %   The \pkg{l3doc} package\\ Experimental documentation features^^A
 % }
@@ -49,14 +59,6 @@
 %
 % \maketitle
 %
-% This isn't included in the typeset documentation because it's a bit
-% ugly:
-% ^^A Why? --Phelype
-%<*package>
-\ProvidesExplPackage{l3doc}{2019-08-27}{}
-  {L3 Experimental documentation package}
-%</package>
-% \fi
 %
 % \begin{documentation}
 %