texlive[56262] Master/texmf-dist/tex/generic/tex4ht: verbatim,

[commits+karl at tug.org]

Revision: 56262
          http://tug.org/svn/texlive?view=revision&revision=56262
Author:   karl
Date:     2020-09-04 00:40:45 +0200 (Fri, 04 Sep 2020)
Log Message:
-----------
verbatim, fontspec fixes, tex4ht r793-794

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

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

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht	2020-09-03 21:46:42 UTC (rev 56261)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht	2020-09-03 22:40:45 UTC (rev 56262)
@@ -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 @@
 %          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>}}

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht	2020-09-03 21:46:42 UTC (rev 56261)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht	2020-09-03 22:40:45 UTC (rev 56262)
@@ -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

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht	2020-09-03 21:46:42 UTC (rev 56261)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht	2020-09-03 22:40:45 UTC (rev 56262)
@@ -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