texlive[53741]

[commits+karl at tug.org]

Revision: 53741
          http://tug.org/svn/texlive?view=revision&revision=53741
Author:   karl
Date:     2020-02-09 23:19:14 +0100 (Sun, 09 Feb 2020)
Log Message:
-----------
fontspec needs to be able to load fontenc, tex4ht r663

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=663

Modified Paths:
--------------
    trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht	2020-02-09 22:10:19 UTC (rev 53740)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht	2020-02-09 22:19:14 UTC (rev 53741)
@@ -1,4 +1,4 @@
-% usepackage-fontspec.4ht (2020-01-24-14:39), generated from tex4ht-4ht.tex
+% usepackage-fontspec.4ht (2020-02-09-14:16), generated from tex4ht-4ht.tex
 % Copyright 2017-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
@@ -16,15 +16,15 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2020-01-24-14:39}
+\immediate\write-1{version 2020-02-09-14:16}
 
-\: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
@@ -34,7 +34,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}{