(XeTeX) avoid blowing out /GR in case Script= is set

not that XeTeX test file isn't correct but this isn't the time to work on it... closes #456 #456 was fixed recently in other updates
latex3 · May 6, 2024 · 19d8c66 · 19d8c66
1 parent b3e048e
commit 19d8c66
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/fontspec-code-keyval.dtx b/fontspec-code-keyval.dtx
@@ -173,15 +173,15 @@
 %    \begin{macrocode}
 \@@_keys_define_code:nnn {fontspec-preparse} {Script}
   {
-%<XE>    \keys_set:nn {fontspec-renderer} {Renderer=OpenType}
+%<XE>    \tl_if_empty:NT \l_@@_renderer_tl { \keys_set:nn {fontspec-renderer} {Renderer=OpenType} }
     \tl_set:Nn \l_@@_script_name_tl {#1}
   }
 %    \end{macrocode}
 % Exactly the same:
 %    \begin{macrocode}
 \@@_keys_define_code:nnn {fontspec-preparse} {Language}
   {
-%<XE>    \keys_set:nn {fontspec-renderer} {Renderer=OpenType}
+%<XE>    \tl_if_empty:NT \l_@@_renderer_tl { \keys_set:nn {fontspec-renderer} {Renderer=OpenType} }
     \tl_set:Nn \l_@@_lang_name_tl {#1}
   }
 %    \end{macrocode}

diff --git a/testfiles/graphite-awami.luatex.tlg b/testfiles/graphite-awami.luatex.tlg
@@ -0,0 +1,6 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+TU/AwamiNastaliq-Regular.ttf(0)/m/n:
+  [AwamiNastaliq-Regular.ttf]:mode=harf;shaper=graphite2;script=arab;language=dflt;+tlig;
+***************
+Compilation 1 of test file completed with exit status 0
diff --git a/testfiles/graphite-awami.lvt b/testfiles/graphite-awami.lvt
@@ -0,0 +1,8 @@
+\input{fontspec-testsetup.tex}
+
+\usepackage{fontspec}
+\setmainfont{AwamiNastaliq-Regular.ttf}[Renderer=Graphite,Script=Arabic]
+\begin{document}
+وفا
+\CURRNFSS
+\end{document}
diff --git a/testfiles/graphite-awami.tlg b/testfiles/graphite-awami.tlg
@@ -0,0 +1,6 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+TU/AwamiNastaliq-Regular.ttf(0)/m/n:
+  "[AwamiNastaliq-Regular.ttf]/GR:mapping=tex-text;"
+***************
+Compilation 1 of test file completed with exit status 0