correct key handling (see #750)

latex3 · Jan 20, 2022 · 9be6aab · 9be6aab
1 parent da8e6de
commit 9be6aab
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/base/changes.txt b/base/changes.txt
@@ -5,6 +5,12 @@ It is provided for convenience only.  It therefore makes no claims to
 completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
+
+2022-01-20  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* doc.dtx (subsection{Keys supported by doc):
+	Fixed key handling for nohyperref and nomulticol (gh/750).
+
 2022-01-15  Joseph Wright  <Joseph.Wright-project.org>
 
 	* ltkeys.dtx:

diff --git a/base/doc.dtx b/base/doc.dtx
@@ -43,12 +43,9 @@
 %<+package>                   {doc-2021-06-01.sty}
 %<+package>\DeclareCurrentRelease{v3}{2022-06-01}
 %<+package>
-%<*package>
-%<-beta>\ProvidesPackage{doc}
-%<+beta>\ProvidesPackage{doc-v3beta}
-%</package>
+%<+package>\ProvidesPackage{doc}
 %<+shortvrb>\ProvidesPackage{shortvrb}
-%<+package|shortvrb>  [2022/06/01 v3.0g
+%<+package|shortvrb>  [2022/06/01 v3.0h
 %<+package|shortvrb>   Standard LaTeX documentation package V3 (FMi)]
 %\catcode`\<=12
 %
@@ -1939,7 +1936,10 @@
     hyperref / true  .code:n = { \legacy_if_set_true:n  { doc@hyperref } },
     hyperref / false .code:n = { \legacy_if_set_false:n { doc@hyperref } },
     hyperref  .default:n = { true },
-    hyperref  .choice:,
+%    \end{macrocode}
+% \changes{v3.0h}{2022/06/01}{fix choice key name (gh/750)}
+%    \begin{macrocode}
+    nohyperref  .choice:,
     nohyperref / true  .code:n = { \legacy_if_set_false:n  { doc@hyperref } },
     nohyperref / false .code:n = { \legacy_if_set_true:n { doc@hyperref } },
     nohyperref  .default:n = { true },
@@ -1950,7 +1950,10 @@
     nomulticol  .choice:,
     nomulticol / true  .code:n = { \legacy_if_set_false:n  { doc@multicol } },
     nomulticol / false .code:n = { \legacy_if_set_true:n { doc@multicol } },
-    multicol  .default:n = { true },
+%    \end{macrocode}
+% \changes{v3.0h}{2022/06/01}{fix default key name (gh/750)}
+%    \begin{macrocode}
+    nomulticol  .default:n = { true },
     debugshow  .choice:,
     debugshow / true  .code:n = { \legacy_if_set_true:n  { doc@debugshow } },
     debugshow / false .code:n = { \legacy_if_set_false:n { doc@debugshow } },

diff --git a/base/testfiles-doc/github-0750.lvt b/base/testfiles-doc/github-0750.lvt
@@ -0,0 +1,16 @@
+\documentclass [a4paper]{article}
+
+\let\dotfillLaTeXORI =\dotfill     % < Save original LaTeX2e definition >
+
+\usepackage [nohyperref=true,nomulticol]{doc}
+
+\input{test2e}
+
+\START
+
+\makeatletter
+\show\ifdoc@hyperref % should be \iffalse
+\show\ifdoc@multicol % should be \iffalse
+
+
+\END
diff --git a/base/testfiles-doc/github-0750.tlg b/base/testfiles-doc/github-0750.tlg
@@ -0,0 +1,8 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+> \ifdoc@hyperref=\iffalse.
+l. ...\show\ifdoc@hyperref
+                          % should be \iffalse
+> \ifdoc@multicol=\iffalse.
+l. ...\show\ifdoc@multicol
+                          % should be \iffalse
diff --git a/base/update-doc.sh b/base/update-doc.sh
@@ -1,5 +1,6 @@
 l3build save -cconfig-doc -eetex \
         github-0023 \
+        github-0750 \
 	tlb-dox013 \
 	tlb-dox014