[latex3-commits] [git/LaTeX3-latex3-latex2e] master: anticipating a kernel change (and anyway it was bad coding) (4e49376)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/4e493765e74de2acc9f52444ac7c3481435b5f12

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

commit 4e493765e74de2acc9f52444ac7c3481435b5f12
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Feb 1 19:11:41 2018 +0100

    anticipating a kernel change (and anyway it was bad coding)


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

4e493765e74de2acc9f52444ac7c3481435b5f12
 base/changes.txt |    5 +++++
 base/doc.dtx     |   13 +++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 37c4763..abfe5f5 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -4,6 +4,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2018-02-01    <Frank.Mittelbach at latex-project.org>
+
+	* doc.dtx: Only use\DocStyleParms if defined
+        (previously the test defined it but this will change in the kernel)
+
 2018-01-08  David Carlisle  <latex-bugs at latex-project.org>
 
 	* ltvers.dtx: Modify \IncludeInRelease code to check matching \EndIncluderelease
diff --git a/base/doc.dtx b/base/doc.dtx
index 050b686..5225a9a 100644
--- a/base/doc.dtx
+++ b/base/doc.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2017
+% Copyright 1993-2018
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -35,7 +35,7 @@
 %<+package|shortvrb>\NeedsTeXFormat{LaTeX2e}[1994/12/01]
 %<+package> \ProvidesPackage{doc}
 %<+shortvrb>\ProvidesPackage{shortvrb}
-%<+package|shortvrb>  [2017/06/30 v2.1g
+%<+package|shortvrb>  [2018/02/01 v2.1h
 %<+package|shortvrb>   Standard LaTeX documentation package (FMi)]
 %\catcode`\<=12
 %
@@ -4836,13 +4836,14 @@
 %    undefined before \texttt{doc.sty} is read in.  The default values
 %    for the internal registers are scattered over this file.
 % \changes{v1.5u}{1989/11/14}{\cs{DocStyleParms} now empty}
+% \changes{v2.1h}{2018/02/01}{Only use\cs{DocStyleParms} if defined
+%                             (previously the test defined it)}
 %    \begin{macrocode}
-\@ifundefined{DocstyleParms}{}{}
+\@ifundefined{DocstyleParms}{}{\DocstyleParms}
 %    \end{macrocode}
-%    Now we allow overwriting the values by calling
-%    |\DocstyleParms|.
+%    Clear out |\DocstyleParms| after use (or non-use).
 %    \begin{macrocode}
-\DocstyleParms     \let\DocstyleParms\relax
+ \let\DocstyleParms\relax
 %    \end{macrocode}
 % \end{macro}
 %