[latex3-commits] [git/LaTeX3-latex3-fontspec] l3color: fontspec support for extended luaotfload color feature (4cd0015)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/fontspec
On branch  : l3color
Link       : https://github.com/latex3/fontspec/commit/4cd001559d7797c61ae13dc7844240b09bcf1c41

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

commit 4cd001559d7797c61ae13dc7844240b09bcf1c41
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Tue Jun 7 08:42:56 2022 +0200

    fontspec support for extended luaotfload color feature


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

4cd001559d7797c61ae13dc7844240b09bcf1c41
 fontspec-code-internal.dtx | 3 ++-
 fontspec-code-keyval.dtx   | 6 ++++++
 fontspec-code-vars.dtx     | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fontspec-code-internal.dtx b/fontspec-code-internal.dtx
index 8437939..3bb89c7 100644
--- a/fontspec-code-internal.dtx
+++ b/fontspec-code-internal.dtx
@@ -371,7 +371,8 @@
 
     \str_if_eq:eeF { \l_@@_hexcol_tl \l_@@_opacity_tl }
                      { \c_@@_hexcol_tl \c_@@_opacity_tl }
-      { \@@_update_featstr:n { color = \l_@@_hexcol_tl\l_@@_opacity_tl } }
+%<XE>       { \@@_update_featstr:n { color = \l_@@_hexcol_tl\l_@@_opacity_tl } }
+%<LU>       { \@@_update_featstr:n { color = {\l_@@_hexcol_tl\l_@@_opacity_tl} } }
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/fontspec-code-keyval.dtx b/fontspec-code-keyval.dtx
index 1c064ba..e4dc19f 100644
--- a/fontspec-code-keyval.dtx
+++ b/fontspec-code-keyval.dtx
@@ -701,6 +701,7 @@
 %    \begin{macrocode}
 \@@_keys_define_code:nnn {fontspec} {Color}
   {
+%<*XE>
     \cs_if_exist:cTF { \token_to_str:N \color@ #1 }
       {
         \convertcolorspec{named}{#1}{HTML}\l_@@_hexcol_tl
@@ -717,6 +718,10 @@
               }
           }
       }
+%</XE>
+%<*LU>
+    \tl_set:Nn \l_@@_hexcol_tl {#1}
+%</LU>
   }
 %    \end{macrocode}
 %
@@ -745,6 +750,7 @@
       }
     \tl_set:Nx \l_@@_opacity_tl
       {
+%<LU>      ,
         \int_compare:nT { \l_@@_tmp_int <= "F } {0} % zero pad
         \int_to_hex:n { \l_@@_tmp_int }
       }
diff --git a/fontspec-code-vars.dtx b/fontspec-code-vars.dtx
index fc1321a..709b713 100644
--- a/fontspec-code-vars.dtx
+++ b/fontspec-code-vars.dtx
@@ -295,7 +295,8 @@
 %
 %    \begin{macrocode}
 \tl_const:Nn \c_@@_hexcol_tl {000000}
-\tl_const:Nn \c_@@_opacity_tl {FF~}
+%<XE> \tl_const:Nn \c_@@_opacity_tl {FF~}
+%<LU> \tl_const:Nn \c_@@_opacity_tl {}
 \tl_const:Nn \c_@@_postadjust_tl { \l_@@_wordspace_adjust_tl \l_@@_punctspace_adjust_tl }
 %    \end{macrocode}
 %