disable * replacements if the first argument itself has a star

trying to address #437 but this only fixes the issue on the fontspec side; suspect NFSS itself is tripping up next
latex3 · May 7, 2024 · abd2bfc · abd2bfc
1 parent 013ddc3
commit abd2bfc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/fontspec-code-api.dtx b/fontspec-code-api.dtx
@@ -388,6 +388,7 @@
     \@@_tl_new_if_free:N #1
     #4 #1 \l_fontspec_family_tl
     \tl_set:Nn \l_@@_fontface_cs_tl {\l_fontspec_font} % reset
+%<debug>\typeout{::::::~END~fontspec_set_family:Nnn}
   }
 \cs_new:Nn \fontspec_gset_family:Nnn { \@@_set_family:NnnN #1 {#2} {#3} \tl_gset_eq:NN }
 \cs_new:Nn \fontspec_set_family:Nnn  { \@@_set_family:NnnN #1 {#2} {#3} \tl_set_eq:NN  }

diff --git a/fontspec-code-internal.dtx b/fontspec-code-internal.dtx
@@ -78,6 +78,7 @@
     \group_end:
 
     \tl_set_eq:NN \l_fontspec_family_tl \g_@@_nfss_family_tl
+%<debug>\typeout{::::::::::::::::::::::::::::::}
   }
 %    \end{macrocode}
 % \end{macro}
@@ -558,7 +559,10 @@
 \cs_new:Nn \fontspec_complete_fontname:Nn
   {
     \tl_set:Nx #1 {#2}
-    \tl_replace_all:Nne #1 {*} {\l_@@_basename_tl}
+    \tl_if_in:NnF \l_fontspec_fontname_tl {*}
+      {
+        \tl_replace_all:Nne #1 {*} {\l_@@_basename_tl}
+      }
   }
 %    \end{macrocode}
 % \end{macro}