[latex3-commits] [git/LaTeX3-latex3-latex2e] gh750: correct key handling (see #750) (9be6aab0)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : gh750
Link       : https://github.com/latex3/latex2e/commit/9be6aab0d411cf5a8dd3473c588e931d4b621889

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

commit 9be6aab0d411cf5a8dd3473c588e931d4b621889
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Jan 20 16:53:58 2022 +0100

    correct key handling (see #750)


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

9be6aab0d411cf5a8dd3473c588e931d4b621889
 base/changes.txt                   |  6 ++++++
 base/doc.dtx                       | 17 ++++++++++-------
 base/testfiles-doc/github-0750.lvt | 16 ++++++++++++++++
 base/testfiles-doc/github-0750.tlg |  8 ++++++++
 base/update-doc.sh                 |  1 +
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index eaffe9f8..566e669b 100644
--- 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 at 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
index e6b0e2cf..7c602327 100644
--- 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 at hyperref } },
     hyperref / false .code:n = { \legacy_if_set_false:n { doc at 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 at hyperref } },
     nohyperref / false .code:n = { \legacy_if_set_true:n { doc at hyperref } },
     nohyperref  .default:n = { true },
@@ -1950,7 +1950,10 @@
     nomulticol  .choice:,
     nomulticol / true  .code:n = { \legacy_if_set_false:n  { doc at multicol } },
     nomulticol / false .code:n = { \legacy_if_set_true:n { doc at 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 at debugshow } },
     debugshow / false .code:n = { \legacy_if_set_false:n { doc at debugshow } },
diff --git a/base/testfiles-doc/github-0750.lvt b/base/testfiles-doc/github-0750.lvt
new file mode 100644
index 00000000..dfd56829
--- /dev/null
+++ 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 at hyperref % should be \iffalse
+\show\ifdoc at multicol % should be \iffalse
+
+ 
+\END
diff --git a/base/testfiles-doc/github-0750.tlg b/base/testfiles-doc/github-0750.tlg
new file mode 100644
index 00000000..1091fd25
--- /dev/null
+++ 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 at hyperref=\iffalse.
+l. ...\show\ifdoc at hyperref
+                          % should be \iffalse
+> \ifdoc at multicol=\iffalse.
+l. ...\show\ifdoc at multicol
+                          % should be \iffalse
diff --git a/base/update-doc.sh b/base/update-doc.sh
index 3c18ad38..5a2a5e1e 100644
--- 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