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

[michal_h21 at gnu.org.ua]

Author: michal_h21
Date: 2020-09-02 22:33:56 +0300 (Wed, 02 Sep 2020)
New Revision: 793

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-4ht.tex
Log:
fix fontspec for latex-dev

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2020-09-01 09:58:35 UTC (rev 792)
+++ trunk/lit/ChangeLog	2020-09-02 19:33:56 UTC (rev 793)
@@ -1,3 +1,9 @@
+2020-09-02  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex(usepackage.4ht, usepackage-fontspec.4ht):
+	fix for the development version of LaTeX.
+	https://puszcza.gnu.org.ua/bugs/?477
+
 2020-09-01  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-fonts-ebgaramond.tex,

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2020-09-01 09:58:35 UTC (rev 792)
+++ trunk/lit/tex4ht-4ht.tex	2020-09-02 19:33:56 UTC (rev 793)
@@ -3838,7 +3838,7 @@
 
 \<add to usepackage\><<<
 \def\:temp{fontspec}\ifx \@currname\:temp
-  \ifdefined\fontspec
+  \ifdefined\texfourhtfontspecloaded%
     \:dontusepackage{fontspec}
   \else 
     \input usepackage-fontspec.4ht
@@ -3852,9 +3852,10 @@
 % usepackage-fontspec.4ht (|version), generated from |jobname.tex
 % Copyright 2017-2020 TeX Users Group
 |<TeX4ht license text|>
-\RequirePackage{expl3}% we need to disable them before loading
+% \RequirePackage{expl3}% we need to disable them before loading
 \ExplSyntaxOn
 \seq_new:N \fontspec_ht_scripts
+\gdef\texfourhtfontspecloaded{yes}% used to prevent subsequent loading of this file
 \ExplSyntaxOff
 \ifdefined\XeTeXversion%
 \xenunidelblock{Latin-expl3}% expl3 package makes some characters active