[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Output 'friendly' package names (fixes #895) (90ef23b7)

[Joseph Wright]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/90ef23b7692699ba3006ab821cde083967b25537

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

commit 90ef23b7692699ba3006ab821cde083967b25537
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Jul 23 13:50:20 2022 +0100

    Output 'friendly' package names (fixes #895)


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

90ef23b7692699ba3006ab821cde083967b25537
 base/changes.txt               |  5 +++++
 base/ltkeys.dtx                | 28 +++++++++++++++++++++++-----
 base/testfiles/github-0892.tlg |  4 ++--
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 0c9fbba1..ce7aa6b3 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2022-07-23
+
+    * ltkeys.dtx: <Joseph.Wright at latex-project.org>
+	Output 'friendly' package names in messages
+
 2022-07-10  David Carlisle  <David.Carlisle at latex-project.org>
 
 	* cmfonts.fdd: avoid EC sans serif fonts at small design sizes.
diff --git a/base/ltkeys.dtx b/base/ltkeys.dtx
index df671d42..d6ac60c1 100644
--- a/base/ltkeys.dtx
+++ b/base/ltkeys.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltkeys.dtx}
-             [2022/07/05 v1.0i LaTeX Kernel (Kevyal options)]
+             [2022/07/23 v1.0j LaTeX Kernel (Kevyal options)]
 % \iffalse
 \documentclass{l3doc}
 \GetFileInfo{ltkeys.dtx}
@@ -251,11 +251,15 @@
     \@@_option_end:
     \@@_options_loaded:n {#1}
   }
+%    \end{macrocode}
+% \changes{v1.0j}{2022/07/23}
+%         {Output `public' package name in messages}
+%    \begin{macrocode}
 \msg_new:nnnn { keys } { option-unknown }
   { Unknown~option~'#1'~for~package~#2. }
   {
     LaTeX~has~been~asked~to~set~an~option~called~'#1'~
-    but~the~#2~package~has~not~created~an~option~with~this~name.
+    but~the~package~"\msg_module_name:n {#2}"~has~not~created~an~option~with~this~name.
   }
 %    \end{macrocode}
 % \end{macro}
@@ -498,13 +502,27 @@
       }
       { \msg_error:nnnn { keys } { load-only } {#1} {#2} }
   }
+%    \end{macrocode}
+% \changes{v1.0j}{2022/07/23}
+%         {Output `public' package name in messages}
+%    \begin{macrocode}
 \msg_new:nnn { keys } { load-option-ignored }
-  { Package~"#1"~has~already~been~loaded:~ignoring~load-time~option~"#2". }
+  {
+    Package~"\msg_module_name:n {#1}"~has~already~been~loaded:~
+    ignoring~load-time~option~"#2".
+  }
+%    \end{macrocode}
+% \changes{v1.0j}{2022/07/23}
+%         {Output `public' package name in messages}
+%    \begin{macrocode}
 \msg_new:nnnn { keys } { load-only }
-  { Key~"#2"~may~only~be~used~in~the~during~loading~of~package~"#1". }
+  {
+    Key~"#2"~may~only~be~used~in~the~during~loading~of~package~
+    "\msg_module_name:n {#1}".
+  }
   {
     LaTeX~was~asked~to~set~a~key~called~"#2",~but~this~is~only~allowed~
-    in~the~optional~argument~when~loading~package~"#1".
+    in~the~optional~argument~when~loading~package~"\msg_module_name:n{#1}".
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/base/testfiles/github-0892.tlg b/base/testfiles/github-0892.tlg
index 13982b04..d1915ff3 100644
--- a/base/testfiles/github-0892.tlg
+++ b/base/testfiles/github-0892.tlg
@@ -32,8 +32,8 @@ You gave `extra stuff' for option4
 For immediate help type H <return>.
  ...                                              
 l. ...^^M
-LaTeX has been asked to set an option called 'option5' but the
-l3keys2e-package package has not created an option with this name.
+LaTeX has been asked to set an option called 'option5' but the package
+"l3keys2e-package" has not created an option with this name.
 This is a generated file for the LaTeX2e validation system.
 Don't change this file in any respect.
 (github-0892.aux)