[latex3-commits] [latex3/latex3] main: Use \l_keys_path_tl not _key_tl in bool errors (see #1013) (b1743679b)

github at latex-project.org github at latex-project.org
Mon May 22 17:08:25 CEST 2023


Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/b1743679bb5c19a3c3e934e354dff6bd941a44bf

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

commit b1743679bb5c19a3c3e934e354dff6bd941a44bf
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon May 22 16:08:25 2023 +0100

    Use \l_keys_path_tl not _key_tl in bool errors (see #1013)


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

b1743679bb5c19a3c3e934e354dff6bd941a44bf
 l3kernel/CHANGELOG.md            |  2 ++
 l3kernel/l3keys.dtx              |  4 ++--
 l3kernel/testfiles/m3keys002.lvt | 11 ++++++++++-
 l3kernel/testfiles/m3keys002.tlg | 13 +++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index c0220232f..1bf7d5ddb 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -25,6 +25,8 @@ this project uses date-based 'snapshot' version identifiers.
 - Omit `0123456789` from URL escaping (issue \#838)
 - Leave implicit chars unchanged in `\text_expand:n` (issue \#874)
 - Filtering/grouping applied to meta keys (issue \#940)
+- Issue correct error message if `bool` key is set
+  incorrectly using `.initial:n` (issue \#1013)
 - Handling of implicit chars in `\text_purify:n` (issue \#1208)
 
 ## [2023-05-15]
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 733524e56..a7e8f9e40 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1888,7 +1888,7 @@
     \@@_cmd_set_direct:nn { \l_keys_path_str / unknown }
       {
         \msg_error:nnx { keys } { boolean-values-only }
-          \l_keys_key_str
+          \l_keys_path_str
       }
     \@@_default_set:n { true }
   }
@@ -2097,7 +2097,7 @@
     \@@_cmd_set:nn { \l_keys_path_str / unknown }
       {
         \msg_error:nnx { keys } { boolean-values-only }
-          \l_keys_key_str
+          \l_keys_path_str
       }
     \@@_default_set:n { true }
     \cs_if_exist:cF { if#1 }
diff --git a/l3kernel/testfiles/m3keys002.lvt b/l3kernel/testfiles/m3keys002.lvt
index a7831453e..883d7acf5 100644
--- a/l3kernel/testfiles/m3keys002.lvt
+++ b/l3kernel/testfiles/m3keys002.lvt
@@ -1,4 +1,4 @@
-% Copyright (C) 2013,2015,2018,2019,2021 The LaTeX Project
+% Copyright (C) 2013,2015,2018,2019,2021,2023 The LaTeX Project
 
 
 \documentclass{minimal}
@@ -687,6 +687,15 @@
     \prop_log:N \g_mya_prop
   }
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\TEST { .bool_set:N~errors }
+  {
+    \keys_define:nn { module }
+      { key-one .bool_set:N  = \l_tmpa_bool  }
+    \keys_set:nn { module }
+      { key-one = foo }
+  }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/l3kernel/testfiles/m3keys002.tlg b/l3kernel/testfiles/m3keys002.tlg
index 74c4b5b8d..5460a9fa3 100644
--- a/l3kernel/testfiles/m3keys002.tlg
+++ b/l3kernel/testfiles/m3keys002.tlg
@@ -471,3 +471,16 @@ The property list \g_tmpa_prop contains the pairs (without outer braces):
 The property list \g_mya_prop contains the pairs (without outer braces):
 >  {key-four}  =>  {d}.
 ============================================================
+============================================================
+TEST 24: .bool_set:N errors
+============================================================
+Defining key module/key-one on line ...
+Defining key module/key-one/unknown on line ...
+Defining key module/key-one/true on line ...
+Defining key module/key-one/false on line ...
+! LaTeX Error: Key 'module/key-one' accepts boolean values only.
+For immediate help type H <return>.
+ ...                                              
+l. ...  }
+The key 'module/key-one' only accepts the values 'true' and 'false'.
+============================================================





More information about the latex3-commits mailing list.