use e-type expl3 functions, tex4ht r1382-1386

git-svn-id: svn://tug.org/texlive/trunk@68524 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 49 insertions, 23 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 5b65c3b2828..b337ea50bda 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,29 @@
+2023-10-12  Karl Berry  <karl@freefriends.org>
+
+	* tex4ht-c.tex (<span char block>): avoid negative indexing into
+	font_tbl. Partial fix for report from Oliver Freyermuth,
+	https://puszcza.gnu.org.ua/bugs/?611.
+
+2023-10-12  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (piton.4ht): use e-type Expl3 functions.
+	https://www.texdev.net/2023/10/10/get-the-jag-from-x-type-to-e-type
+
+	* tex4ht-4ht.tex (tabularray.4ht): use e-type Expl3 functions.
+	https://www.texdev.net/2023/10/10/get-the-jag-from-x-type-to-e-type
+
+	* tex4ht-4ht.tex (usepackage-fontspec.4ht): use e-type Expl3
+	functions.
+	https://www.texdev.net/2023/10/10/get-the-jag-from-x-type-to-e-type
+
+	* tex4ht-html4.tex (html4.4ht): use e-type Expl3 function in
+	Siunixtx's MathJax support code.
+	https://www.texdev.net/2023/10/10/get-the-jag-from-x-type-to-e-type
+
+	* tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): changed deprecated
+	\tl_set:Nx to \tl_set:Ne.
+	https://www.texdev.net/2023/10/10/get-the-jag-from-x-type-to-e-type
+
 2023-10-09  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-4ht.tex (usepackage-fontspec.4ht): process keyval options
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 2374a35fd96..a98aa163b0f 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1381 2023-10-09 21:22:59Z karl $
+% $Id: tex4ht-4ht.tex 1386 2023-10-12 14:03:28Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2023 TeX Users Group    
@@ -4617,11 +4617,11 @@ The actual configurations which are used when fontspec is loaded:
 \PassOptionsToPackage{no-math}{fontspec}
 \ExplSyntaxOn
 \:AtEndOfPackage{%
-  \tl_gset:Nx \l__fontspec_nfss_enc_tl {T1}
-  \tl_gset:Nx \g_fontspec_encoding_tl {T1}
-  \tl_gset:Nx \l__fontspec_ttfamily_encoding_tl {T1}
-  \tl_gset:Nx \l__fontspec_sffamily_encoding_tl {T1}
-  \tl_gset:Nx \l__fontspec_rmfamily_encoding_tl {T1}
+  \tl_gset:Ne \l__fontspec_nfss_enc_tl {T1}
+  \tl_gset:Ne \g_fontspec_encoding_tl {T1}
+  \tl_gset:Ne \l__fontspec_ttfamily_encoding_tl {T1}
+  \tl_gset:Ne \l__fontspec_sffamily_encoding_tl {T1}
+  \tl_gset:Ne \l__fontspec_rmfamily_encoding_tl {T1}
   \seq_new:N \fontspec_ht_fontfamilies
   \ifdefined\XeTeXversion
   \keys_define:nn {fontspec4ht}{
@@ -11075,7 +11075,7 @@ handling. Michal
 
 \<tabularray.4ht\><<< 
 % tabularray.4ht (|version), generated from |jobname.tex 
-% Copyright 2022 TeX Users Group 
+% Copyright 2022-2023 TeX Users Group 
 |<TeX4ht license text|> 
 |<tabularray definitions|>
 |<tabularray table and rows|>
@@ -11136,36 +11136,36 @@ using CSS, so we don't try that.
 % #1 row number, #2 column, #3 hline number (there can be multiple), #4 css property to be set
 \def\:tblr:hlinestyle#1#2#3#4{
   % get line height
-  \tl_set:Nx \l__tblr_h_tl{ \__tblr_spec_item:ne { hline } { [#1](#3) / @hline-height } }
+  \tl_set:Ne \l__tblr_h_tl{ \__tblr_spec_item:ne { hline } { [#1](#3) / @hline-height } }
   % get dash style
   \def\@tblr@dash{} % remove "dash" word from the variable for correct CSS string
-  \tl_set:Nx \l__tblr_f_tl{\__tblr_spec_item:ne { hline } { [#1][#2](#3) / @dash }}
+  \tl_set:Ne \l__tblr_f_tl{\__tblr_spec_item:ne { hline } { [#1][#2](#3) / @dash }}
   % create CSS only when a dash style is set 
   \tl_if_empty:NF\l__tblr_f_tl{
     % get hline color
-    \tl_set:Nx \l__tblr_g_tl { \__tblr_spec_item:ne { hline } { [#1][#2](#3) / fg } }
+    \tl_set:Ne \l__tblr_g_tl { \__tblr_spec_item:ne { hline } { [#1][#2](#3) / fg } }
     \def\:hlinecolor{\#000000}
     % convert color to CSS value if color is set
     \tl_if_empty:NF\l__tblr_g_tl{\get:xcolorcss{\l__tblr_g_tl}\:hlinecolor}
     % \Configure{tabularraystyles} doesn't expand attributes, so we need to expand it here
     % otherwise, we would get wrong color and hline style in the last row, because this macro is called twice here
-    \cs_set:cx{#4:}{#4:\dim_to_decimal_in_unit:nn{\l__tblr_h_tl*2}{1px}px~\l__tblr_f_tl\space~\:hlinecolor;}
+    \cs_set:ce{#4:}{#4:\dim_to_decimal_in_unit:nn{\l__tblr_h_tl*2}{1px}px~\l__tblr_f_tl\space~\:hlinecolor;}
     \Configure{tabularraystyles}{\csname#4:\endcsname}
   }
 }
 
 \def\:tblr:vlinestyle#1#2#3#4{
-  \tl_set:Nx \l__tblr_t_tl{ \__tblr_spec_item:ne { vline } { [#2](#3) / @vline-width } }
+  \tl_set:Ne \l__tblr_t_tl{ \__tblr_spec_item:ne { vline } { [#2](#3) / @vline-width } }
   \def\@tblr@dash{} % remove "dash" word from the variable for correct CSS string
-  \tl_set:Nx \l__tblr_f_tl{\__tblr_spec_item:ne { vline } { [#1][#2](#3) / @dash }}
+  \tl_set:Ne \l__tblr_f_tl{\__tblr_spec_item:ne { vline } { [#1][#2](#3) / @dash }}
   \tl_if_empty:NF\l__tblr_f_tl{
-    \tl_set:Nx \l__tblr_g_tl { \__tblr_spec_item:ne { vline } { [#1][#2](#3) / fg } }
+    \tl_set:Ne \l__tblr_g_tl { \__tblr_spec_item:ne { vline } { [#1][#2](#3) / fg } }
     \def\:hlinecolor{\#000000}
     % convert color to CSS value if color is set
     \tl_if_empty:NF\l__tblr_g_tl{\get:xcolorcss{\l__tblr_g_tl}\:hlinecolor}
     % \Configure{tabularraystyles} doesn't expand attributes, so we need to expand it here
     % otherwise, we would get wrong color and hline style in the last row, because this macro is called twice here
-    \cs_set:cx{#4:}{#4:\dim_to_decimal_in_unit:nn{\l__tblr_t_tl*2}{1px}px~\l__tblr_f_tl\space~\:hlinecolor;}
+    \cs_set:ce{#4:}{#4:\dim_to_decimal_in_unit:nn{\l__tblr_t_tl*2}{1px}px~\l__tblr_f_tl\space~\:hlinecolor;}
     \Configure{tabularraystyles}{\csname#4:\endcsname}
   }
 }
@@ -11218,7 +11218,7 @@ for horizontal and vertical alignment, background color and rules.
     \:tblr:vlinestyle{#1}{\int_eval:n{\c@colnum + 1}}{1}{border-right}
   }
   % support for the background color
-  \tl_set:Nx \l__tblr_b_tl
+  \tl_set:Ne \l__tblr_b_tl
   { \__tblr_data_item:neen { cell } {#1} {#2} { background } }
   % save background color to the list of CSS, if it is set
   \tl_if_empty:NF \l__tblr_b_tl{
@@ -26072,7 +26072,7 @@ Minted, it turns the breaklines option to false when it is used.
     \cs_set_eq:cN { ~ } \space
     \cs_set_protected:Npn \__piton_begin_line: { }
     \cs_set_protected:Npn \__piton_end_line: { }
-    \tl_set:Nx \l_tmpa_tl
+    \tl_set:Ne \l_tmpa_tl
       {
         \lua_now:e
           { piton.ParseBis('\l__piton_language_str',token.scan_string()) }
@@ -26101,7 +26101,7 @@ Minted, it turns the breaklines option to false when it is used.
     \automatichyphenmode = 1
     \cs_set_protected:Npn \__piton_begin_line: { }
     \cs_set_protected:Npn \__piton_end_line: { }
-    \tl_set:Nx \l_tmpa_tl
+    \tl_set:Ne \l_tmpa_tl
       {
         \lua_now:e
           { piton.Parse('\l__piton_language_str',token.scan_string()) }
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index 990317494a9..4a607faa942 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1378 2023-10-09 11:33:14Z michal_h21 $
+% $Id: tex4ht-html4.tex 1383 2023-10-12 13:00:56Z michal_h21 $
 % Compile 4 times: latex tex4ht-html4
 % Copy html4.4ht into the work directory before all but the last compilation.
 %
@@ -21690,7 +21690,7 @@ users redefine the latter macro.
 \cs_gset_protected:Npn \__siunitx_print_math_auxii:n #1
   {
     \tl_set:Nn \l__siunitx_print_tmp_tl {#1}
-    \exp_args:NNnx \tl_replace_all:Nnn \l__siunitx_print_tmp_tl
+    \exp_args:NNne \tl_replace_all:Nnn \l__siunitx_print_tmp_tl
       { ^ } { \token_to_str:N ^ }
     % escape special HTML characters
     \regex_replace_all:nnN { \x{26} } { &amp; } \l__siunitx_print_tmp_tl
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
index 4a7c7b33664..a02f8d1c544 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathjax.tex 1302 2023-02-27 22:21:51Z karl $
+% $Id: tex4ht-mathjax.tex 1382 2023-10-12 12:52:53Z michal_h21 $
 % compile: latex tex4ht-mathjax
 %
 % Copyright 2018-2023 TeX Users Group
@@ -59,14 +59,14 @@ We still use regula expressions to escape invalid XML characters to entities, so
 \ExplSyntaxOn
 \cs_new_protected:Npn \alteqtoks #1
 {
-  \tl_set:Nx \l_tmpa_tl {\detokenize{#1}}
+  \tl_set:Ne \l_tmpa_tl {\detokenize{#1}}
   % % replace < > and & with xml entities
   \regex_replace_all:nnN { \x{26} } { &amp; } \l_tmpa_tl
   \regex_replace_all:nnN { \x{3C} } { &lt; } \l_tmpa_tl 
   \regex_replace_all:nnN { \x{3E} } { &gt; } \l_tmpa_tl
   % replace \par command with blank lines
   \regex_replace_all:nnN { \x{5C}par\b } {\x{A}\x{A}} \l_tmpa_tl
-  \tl_set:Nx \l_tmpb_tl{ \l_tmpa_tl }
+  \tl_set:Ne \l_tmpb_tl{ \l_tmpa_tl }
   \HCode{\l_tmpb_tl}
 }
 \ExplSyntaxOff