[latex3-commits] [latex3/fontspec] use-keyval: move missing messages into style (998e68e)

[github at latex-project.org]

Repository : https://github.com/latex3/fontspec
On branch  : use-keyval
Link       : https://github.com/latex3/fontspec/commit/998e68e998cf76e309992423580fdf59049a1710

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

commit 998e68e998cf76e309992423580fdf59049a1710
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sun Dec 17 18:54:50 2023 +0100

    move missing messages into style


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

998e68e998cf76e309992423580fdf59049a1710
 fontspec-code-msg.dtx     | 15 +++++++++++----
 fontspec-code-opening.dtx |  6 +++---
 fontspec.ins              |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/fontspec-code-msg.dtx b/fontspec-code-msg.dtx
index b2438c4..034ed6c 100644
--- a/fontspec-code-msg.dtx
+++ b/fontspec-code-msg.dtx
@@ -189,14 +189,21 @@
   Input mapping not supported in LuaTeX.\\
   Use "Ligatures=TeX" instead of "Mapping=tex-text".
  }
-\@@_msg_new:nn {cm-default-obsolete}
+%    \end{macrocode}
+% message for package options must be loaded earlier
+%    \begin{macrocode}
+%</fontspec>
+%<*options>
+\msg_new:nnn {fontspec} {cm-default-obsolete}
  {
-  The "cm-default" package option is obsolete.
+  The~"cm-default"~package~option~is~obsolete.
  }
-\@@_msg_new:nn {enc-obsolete}
+\msg_new:nnn {fontspec} {enc-obsolete}
  {
-  The "#1" package option is obsolete. TU is the default encoding.
+  The~"#1"~package~option~is~obsolete.~TU~is~the~default~encoding.
  }
+%</options>
+%<*fontspec> 
 \@@_msg_new:nn {font-index-needs-ttc}
  {
   The "FontIndex" feature is only supported by TTC (TrueType Collection) fonts.\\
diff --git a/fontspec-code-opening.dtx b/fontspec-code-opening.dtx
index 2151252..d172de6 100644
--- a/fontspec-code-opening.dtx
+++ b/fontspec-code-opening.dtx
@@ -13,7 +13,7 @@
 %    \begin{macrocode}
 \DeclareKeys 
   {
-    cm-default  .code:n = { \@@_warning:n {cm-default-obsolete} }    
+    cm-default  .code:n = { \msg_warning:nn   {fontspec} {cm-default-obsolete} }    
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -25,8 +25,8 @@
     ,config  .usage:n     = load
     ,no-config  .bool_gset_inverse:N = \g_@@_cfg_bool
     ,no-config  .usage:n             = load
-    ,euenc  .code:n = { \@@_warning:nx {enc-obsolete}{euenc} }    
-    ,tuenc  .code:n = { \@@_warning:nx {enc-obsolete}{tuenc} }    
+    ,euenc  .code:n = { \msg_warning:nnn   {fontspec} {enc-obsolete}{euenc} }    
+    ,tuenc  .code:n = { \msg_warning:nnb   {fontspec} {enc-obsolete}{tuenc} }    
 %    \end{macrocode}
 %
 %    \begin{macrocode}
diff --git a/fontspec.ins b/fontspec.ins
index 597ef99..8cc3306 100644
--- a/fontspec.ins
+++ b/fontspec.ins
@@ -33,6 +33,7 @@ the conditions of the LaTeX Project Public License, version 1.3c or higher
 \generate{\file{fontspec.sty}{
   \from{fontspec.dtx}{fontspec,load\FSDEBUG}
   \from{fontspec-code-vars.dtx}{options}
+  \from{fontspec-code-msg.dtx}{options}
   \from{fontspec-code-opening.dtx}{options}
   \from{fontspec-code-load.dtx}{fontspec,load\FSDEBUG}
 }}