summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-24 22:40:28 +0000
committerKarl Berry <karl@freefriends.org>2020-01-24 22:40:28 +0000
commitefc9d0969bbe93ad8522cdeb6e6e50e0d7f27df3 (patch)
treed38ad0604d112cf83e9fe81fae9a123c6d8599a3
parentddaa9672cad711aa5de189db878f0440c8267d87 (diff)
more fontspec issues (tex4ht r661), revert line-height setting (r660)
git-svn-id: svn://tug.org/texlive/trunk@53539 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht5
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht6
2 files changed, 6 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index bae77ead15c..831d464fd0f 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,4 +1,4 @@
-% html4.4ht (2020-01-23-15:53), generated from tex4ht-html4.tex
+% html4.4ht (2020-01-24-14:39), generated from tex4ht-html4.tex
% Copyright 2009-2019 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2020-01-23-15:53}
+\immediate\write-1{version 2020-01-24-14:39}
\exit:ifnot{8859-6,%
CJK,%
@@ -1133,7 +1133,6 @@ switches of tex4ht.c)
\Css{p + div, p + pre {margin-top:1em;}}
\Css{div + p, pre + p {margin-top:1em;}}
}
-\Css{body{line-height:1.5;}}
\NewConfigure{!BODY}[1]{\expandafter\concat:config
\csname a:!BODY\endcsname{#1}}
\expandafter\let\csname a:!BODY\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht
index 5a372c93a86..28bdfed130f 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-23-16:23), generated from tex4ht-4ht.tex
+% usepackage-fontspec.4ht (2020-01-24-14:39), generated from tex4ht-4ht.tex
% Copyright 2017-2020 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2020-01-23-16:23}
+\immediate\write-1{version 2020-01-24-14:39}
\:dontusepackage{fontenc}
\ifdefined\XeTeXversion%
@@ -32,6 +32,8 @@
\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}
\seq_new:N \fontspec_ht_scripts
\seq_new:N \fontspec_ht_fontfamilies
\ifdefined\XeTeXversion