diff options
| author | Karl Berry <karl@freefriends.org> | 2020-02-09 22:19:14 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-02-09 22:19:14 +0000 |
| commit | 4925bff06073821c65c53b89af1e0030fafc61dd (patch) | |
| tree | 3caa6dd6cc563ec7392d1c72eab9cc6dac7d0ff5 | |
| parent | 3ed4824e5746044a28f67f06cd92d80a9beb1002 (diff) | |
fontspec needs to be able to load fontenc, tex4ht r663
git-svn-id: svn://tug.org/texlive/trunk@53741 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht index 28bdfed130f..e8a96f646b4 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht @@ -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}{ |