[tex4ht-commits] [SCM] tex4ht updated: r663 - trunk/lit

[michal_h21 at gnu.org.ua]

Author: michal_h21
Date: 2020-02-09 15:09:29 +0200 (Sun, 09 Feb 2020)
New Revision: 663

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-4ht.tex
Log:
Fixed another Fonstpec fatal issue

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2020-01-24 22:48:20 UTC (rev 662)
+++ trunk/lit/ChangeLog	2020-02-09 13:09:29 UTC (rev 663)
@@ -1,3 +1,8 @@
+2020-02-09 Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (usepackage-fontspec.4ht): don't block the Fontenc package
+	from loading, it caused another fatal issue with Fonspec.
+
 2020-01-24 Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): do not use 1.5 as default line height.

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2020-01-24 22:48:20 UTC (rev 662)
+++ trunk/lit/tex4ht-4ht.tex	2020-02-09 13:09:29 UTC (rev 663)
@@ -3767,13 +3767,13 @@
 % usepackage-fontspec.4ht (|version), generated from |jobname.tex
 % Copyright 2017-2020 TeX Users Group
 |<TeX4ht license text|>
-\:dontusepackage{fontenc}
+\RequirePackage{expl3}% we need to disable them before loading
+\ExplSyntaxOn
+\seq_new:N \fontspec_ht_scripts
+\ExplSyntaxOff
 \ifdefined\XeTeXversion%
 \xenunidelblock{Latin-expl3}% expl3 package makes some characters active
-\RequirePackage{expl3}% we need to disable them before loading
 \xeuniuseblock{Latin-expl3}% and define again
-\else%
-\RequirePackage{expl3}%
 \fi%
 \PassOptionsToPackage{no-math}{fontspec}
 \ExplSyntaxOn
@@ -3783,7 +3783,6 @@
   \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}
-  \seq_new:N \fontspec_ht_scripts
   \seq_new:N \fontspec_ht_fontfamilies
   \ifdefined\XeTeXversion
   \keys_define:nn {fontspec4ht}{