Suppress "load-only" warning for global options

latex3 · Jan 3, 2025 · 663dce7 · 663dce7
1 parent 7267000
commit 663dce7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/base/changes.txt b/base/changes.txt
@@ -6,6 +6,10 @@ to completeness or accuracy and it contains some references to files that are
 not part of the distribution.
 ================================================================================
 
+2025-01-03  Joseph Wright  <[email protected]>
+	* ltclass.dtx
+	Suppress load-only warning for options given globally
+
 2025-01-03  Frank Mittelbach  <[email protected]>
 
 	* lthooks.dtx (subsubsection{Updating code for hooks}):

diff --git a/base/ltkeys.dtx b/base/ltkeys.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltkeys.dtx}
-             [2024/06/20 v1.0o LaTeX Kernel (Keyval options)]
+             [2025/01/03 v1.0p LaTeX Kernel (Keyval options)]
 % \iffalse
 \documentclass{l3doc}
 \GetFileInfo{ltkeys.dtx}
@@ -576,6 +576,7 @@
 % \begin{macro}{\@@_options_loaded:n}
 % \begin{macro}{\@@_options_loaded:nn}
 % \changes{v1.0l}{2022/10/20}{Correct an argument for a message}
+% \changes{v1.0p}{2025-01-03}{Suppress load-only error for global options}
 %   Indicates that the load-time options for a package have been processed:
 %   once this has happened, make them unavailable either with a warning or
 %   an error.
@@ -586,10 +587,14 @@
       {
         \clist_map_inline:Nn \l_@@_tmpa_tl
           {
-            \keys_define:nn {#1}
+            \clist_if_in:NnTF \@classoptionslist {#1}
+              { \keys_define:nn {#1} {##1 .code:n } }
               {
-                ##1 .code:n =
-                  \@@_options_loaded:nn {#1} {##1}
+                \keys_define:nn {#1}
+                  {
+                    ##1 .code:n =
+                      \@@_options_loaded:nn {#1} {##1}
+                  }
               }
           }
       }