From b18f7f1406f112aebedf7ac087de36aedb74362c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Jan 2020 23:57:53 +0000 Subject: plain text \TeX and \LaTeX by default; default line-height; fontspec fix; tex4ht r653-656 git-svn-id: svn://tug.org/texlive/trunk@53522 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 18 ++++++++++++++++-- .../tex/generic/tex4ht/usepackage-fontspec.4ht | 5 +++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index 1bd0c9788a5..bae77ead15c 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 (2019-12-17-15:48), generated from tex4ht-html4.tex +% html4.4ht (2020-01-23-15:53), 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 2019-12-17-15:48} +\immediate\write-1{version 2020-01-23-15:53} \exit:ifnot{8859-6,% CJK,% @@ -1133,6 +1133,7 @@ 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 @@ -3086,12 +3087,17 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \ifx\bf\:UnDef \def\bf{\normalfont\bfseries} \fi +\:CheckOption{fancylogo}\if:Option \def\TeX{\HCode{}T\HCode{}E\HCode{}X\HCode{}} \Css{span.TEX {letter-spacing: -0.125em; }} \Css{span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}} \Css{a span.TEX span.E {text-decoration: none; }} +\else +\def\TeX{TeX} +\fi +\:CheckOption{fancylogo}\if:Option \def\:temp{\HCode{}L\HCode{}A\HCode{}\TeX\HCode{}} \HLet\LaTeX\:temp @@ -3102,6 +3108,10 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \Css{span.LATEX span.A{ position:relative; top:-0.5ex; left:-0.4em; font-size:85\%;}} \Css{span.LATEX span.TEX{ position:relative; left: -0.4em; }} +\else +\def\LaTeX{LaTeX} +\def\LaTeXe{LaTeX2e} +\fi \Configure{@TITLE}{\def\LaTeX{LaTeX}\let\fontencoding\:gobble \let\fontfamily\:gobble \let\fontseries\:gobble \let\fontshape\:gobble \let\usefont\:gobbleIV } @@ -20044,11 +20054,15 @@ Y{0178}\i{00EF}% \fi +\:CheckOption{fancylogo}\if:Option \def\TeX{\HCode{}T\HCode{}E\HCode{}X\HCode{}} \Css{span.TEX {letter-spacing: -0.125em; }} \Css{span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}} \Css{a span.TEX span.E {text-decoration: none; }} +\else +\def\TeX{TeX} +\fi \Configure{underline} {\HCode{}\hbox\bgroup \:gobble} diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht index a0c49803293..d1cc4ed8bad 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 (2018-05-09-14:47), generated from tex4ht-4ht.tex +% usepackage-fontspec.4ht (2020-01-23-15:52), generated from tex4ht-4ht.tex % Copyright 2017 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 2018-05-09-14:47} +\immediate\write-1{version 2020-01-23-15:52} \:dontusepackage{fontenc} \ifdefined\XeTeXversion% @@ -31,6 +31,7 @@ \AtEndOfPackage{% \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} \seq_new:N \fontspec_ht_scripts \seq_new:N \fontspec_ht_fontfamilies \ifdefined\XeTeXversion -- cgit v1.2.3