summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-03 22:40:45 +0000
committerKarl Berry <karl@freefriends.org>2020-09-03 22:40:45 +0000
commit4f3dd4a6c7285c1d19bf7fcf11b241c82f03de50 (patch)
tree6260eda65afea2ffcf6332925b7ae33f0070f19f /Master
parent6c0c70a661099ef2322d444828b7591587c40261 (diff)
verbatim, fontspec fixes, tex4ht r793-794
git-svn-id: svn://tug.org/texlive/trunk@56262 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht6
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht7
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht6
3 files changed, 10 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index f0598ce1e97..2b24cc695b7 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-07-17-14:16), generated from tex4ht-html4.tex
+% html4.4ht (2020-09-02-14:24), generated from tex4ht-html4.tex
% Copyright 2009-2020 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-07-17-14:16}
+\immediate\write-1{version 2020-09-02-14:24}
\exit:ifnot{8859-6,%
CJK,%
@@ -2884,7 +2884,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
% use the command line option `javahelp'}
% \fi
\Configure{verbatim}
- {\HAdvance\Verb:N by 1 \ifnum \Verb:N>1\fi}
+ {\HCode{}}
{\a:sp}
\Configure{verb}
{\HCode{<span class="verb"\a:LRdir>}}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht
index 84867338182..8a64eb289da 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-02-18-14:17), generated from tex4ht-4ht.tex
+% usepackage-fontspec.4ht (2020-09-02-14:24), generated from tex4ht-4ht.tex
% Copyright 2017-2020 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,11 +16,12 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2020-02-18-14:17}
+\immediate\write-1{version 2020-09-02-14:24}
-\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
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index f1f8eec721e..d2de16feb81 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
@@ -1,4 +1,4 @@
-% usepackage.4ht (2020-07-16-14:47), generated from tex4ht-4ht.tex
+% usepackage.4ht (2020-09-02-14:24), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
% Copyright 2009-2020 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2020-07-16-14:47}
+\immediate\write-1{version 2020-09-02-14:24}
\def\:temp{tex4ht}\ifx \:temp\@currname
\:warning{\string\usepackage{tex4ht} again?}
@@ -163,7 +163,7 @@
\ExplSyntaxOff
\fi
\def\:temp{fontspec}\ifx \@currname\:temp
- \ifdefined\fontspec
+ \ifdefined\texfourhtfontspecloaded%
\:dontusepackage{fontspec}
\else
\input usepackage-fontspec.4ht