tocdepth fixes, tex4ht r772-3

git-svn-id: svn://tug.org/texlive/trunk@55848 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 72 insertions, 46 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/article.4ht b/Master/texmf-dist/tex/generic/tex4ht/article.4ht
index 5eb384b6aae..abd7fc3c222 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/article.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/article.4ht
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% article.4ht                           2019-12-19-14:27 %
+% article.4ht                           2020-07-16-14:47 %
 % Copyright (C) 1997-2009       Eitan M. Gurari         %
-% Copyright 2009-2019 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -147,13 +147,13 @@ A script of the form
    \ifnum \c@tocdepth >\z@  section,\fi
 \else
    \ifnum \c@tocdepth >\m@ne chapter,appendix,\fi
-   \ifnum \z@>\c@tocdepth\else section,\fi
-   \ifnum 1>\c@tocdepth \else subsection,\fi
+   \ifnum \c@tocdepth>0 section,\fi
+   \ifnum \c@tocdepth>1 subsection,\fi
 \fi
-\ifnum 2>\c@tocdepth \else subsection,\fi
-\ifnum 3>\c@tocdepth \else subsubsection,\fi
-\ifnum 4>\c@tocdepth \else paragraph,\fi
-\ifnum 5>\c@tocdepth \else subparagraph,\fi
+\ifnum \c@tocdepth>2 subsection,\fi
+\ifnum \c@tocdepth>3 subsubsection,\fi
+\ifnum \c@tocdepth>4 paragraph,\fi
+\ifnum \c@tocdepth>5 subparagraph,\fi
 UnDFexyz}%
    \noexpand\fi}
 \def\:tableofcontents{\futurelet\:temp\:TOC}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/book.4ht b/Master/texmf-dist/tex/generic/tex4ht/book.4ht
index f9ebcbd48b9..b809833399a 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/book.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/book.4ht
@@ -1,6 +1,6 @@
-% book.4ht                             2019-12-19-14:27 %
+% book.4ht                             2020-07-16-14:47 %
 % Copyright (C) 1997-2009      Eitan M. Gurari         %
-% Copyright 2009-2019 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -74,13 +74,13 @@
    \ifnum \c@tocdepth >\z@  section,\fi
 \else
    \ifnum \c@tocdepth >\m@ne chapter,appendix,\fi
-   \ifnum \z@>\c@tocdepth\else section,\fi
-   \ifnum 1>\c@tocdepth \else subsection,\fi
+   \ifnum \c@tocdepth>0 section,\fi
+   \ifnum \c@tocdepth>1 subsection,\fi
 \fi
-\ifnum 2>\c@tocdepth \else subsection,\fi
-\ifnum 3>\c@tocdepth \else subsubsection,\fi
-\ifnum 4>\c@tocdepth \else paragraph,\fi
-\ifnum 5>\c@tocdepth \else subparagraph,\fi
+\ifnum \c@tocdepth>2 subsection,\fi
+\ifnum \c@tocdepth>3 subsubsection,\fi
+\ifnum \c@tocdepth>4 paragraph,\fi
+\ifnum \c@tocdepth>5 subparagraph,\fi
 UnDFexyz}%
    \noexpand\fi}
 \def\:tableofcontents{\futurelet\:temp\:TOC}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/report.4ht b/Master/texmf-dist/tex/generic/tex4ht/report.4ht
index 64d4b913fca..709418ba701 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/report.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/report.4ht
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% report.4ht                           2019-12-19-14:27 %
+% report.4ht                           2020-07-16-14:47 %
 % Copyright (C) 1997-2009      Eitan M. Gurari         %
-% Copyright 2009-2019 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -188,13 +188,13 @@ A script of the form
    \ifnum \c@tocdepth >\z@  section,\fi
 \else
    \ifnum \c@tocdepth >\m@ne chapter,appendix,\fi
-   \ifnum \z@>\c@tocdepth\else section,\fi
-   \ifnum 1>\c@tocdepth \else subsection,\fi
+   \ifnum \c@tocdepth>0 section,\fi
+   \ifnum \c@tocdepth>1 subsection,\fi
 \fi
-\ifnum 2>\c@tocdepth \else subsection,\fi
-\ifnum 3>\c@tocdepth \else subsubsection,\fi
-\ifnum 4>\c@tocdepth \else paragraph,\fi
-\ifnum 5>\c@tocdepth \else subparagraph,\fi
+\ifnum \c@tocdepth>2 subsection,\fi
+\ifnum \c@tocdepth>3 subsubsection,\fi
+\ifnum \c@tocdepth>4 paragraph,\fi
+\ifnum \c@tocdepth>5 subparagraph,\fi
 UnDFexyz}%
    \noexpand\fi}
 \def\:tableofcontents{\futurelet\:temp\:TOC}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht
index 8e8f882c1b2..bf15d8c9706 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht
@@ -1,6 +1,6 @@
-% scrbook.4ht (2019-12-19-14:27), generated from tex4ht-4ht.tex
+% scrbook.4ht (2020-07-16-14:47), generated from tex4ht-4ht.tex
 % Copyright 1999-2009 Eitan M. Gurari
-% Copyright 2009-2019 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2019-12-19-14:27}
+\immediate\write-1{version 2020-07-16-14:47}
 
 \let\o:maketitle:\maketitle
 \let\o:maketitle:\maketitle
@@ -128,13 +128,13 @@
    \ifnum \c@tocdepth >\z@  section,\fi
 \else
    \ifnum \c@tocdepth >\m@ne chapter,appendix,addchap,\fi
-   \ifnum \z@>\c@tocdepth\else section,\fi
-   \ifnum 1>\c@tocdepth \else subsection,\fi
+    \ifnum \c@tocdepth>0 section,\fi
+   \ifnum \c@tocdepth>1 subsection,\fi
 \fi
-\ifnum 2>\c@tocdepth \else subsection,\fi
-\ifnum 3>\c@tocdepth \else subsubsection,\fi
-\ifnum 4>\c@tocdepth \else paragraph,\fi
-\ifnum 5>\c@tocdepth \else subparagraph,\fi
+\ifnum \c@tocdepth>2 subsection,\fi
+\ifnum \c@tocdepth>3 subsubsection,\fi
+\ifnum \c@tocdepth>4 paragraph,\fi
+\ifnum \c@tocdepth>5 subparagraph,\fi
 UnDFexyz}%
    \noexpand\fi}
 \def\:tableofcontents{\futurelet\:temp\:TOC}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht
index c5fff95ab24..6b54fe2d508 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht
@@ -1,6 +1,6 @@
-% scrreprt.4ht (2019-12-19-14:27), generated from tex4ht-4ht.tex
+% scrreprt.4ht (2020-07-16-14:47), generated from tex4ht-4ht.tex
 % Copyright (C) 1999-2009 Eitan M. Gurari
-% Copyright 2009-2019 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2019-12-19-14:27}
+\immediate\write-1{version 2020-07-16-14:47}
 
 \let\o:maketitle:\maketitle
 \def\maketitle{\bgroup
@@ -200,12 +200,12 @@ A script of the form
    \noexpand\else
       \noexpand\Auto:ent{\ifnum \c@tocdepth >-2 part,\fi
    \ifnum \c@tocdepth >\m@ne chapter,appendix,addchap,\fi
-   \ifnum \z@>\c@tocdepth\else section,\fi
-   \ifnum 1>\c@tocdepth \else subsection,\fi
-\ifnum 2>\c@tocdepth \else subsection,\fi
-\ifnum 3>\c@tocdepth \else subsubsection,\fi
-\ifnum 4>\c@tocdepth \else paragraph,\fi
-\ifnum 5>\c@tocdepth \else subparagraph,\fi
+   \ifnum \c@tocdepth>0 section,\fi
+   \ifnum \c@tocdepth>1 subsection,\fi
+\ifnum \c@tocdepth>2 subsection,\fi
+\ifnum \c@tocdepth>3 subsubsection,\fi
+\ifnum \c@tocdepth>4 paragraph,\fi
+\ifnum \c@tocdepth>5 subparagraph,\fi
 UnDFexyz}%
    \noexpand\fi}
 \def\:tableofcontents{\futurelet\:temp\:TOC}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index e012aee8194..f1f8eec721e 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-05-25-14:00), generated from tex4ht-4ht.tex
+% usepackage.4ht (2020-07-16-14:47), 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-05-25-14:00}
+\immediate\write-1{version 2020-07-16-14:47}
 
    \def\:temp{tex4ht}\ifx \:temp\@currname
    \:warning{\string\usepackage{tex4ht} again?}
@@ -33,7 +33,7 @@
 \fi
 
 \fi
-\gdef\a:usepackage{\use:package cleveref,xr,xr-hyper,eso-pic,showframe,expl3,savetrees,biblatex,xeCJK,polyglossia,fontspec,tikz,pdfbase,caption,graphics,xcolor,imakeidx,minted,fancyhdr,,!*?: }
+\gdef\a:usepackage{\use:package cleveref,xr,xr-hyper,eso-pic,showframe,expl3,savetrees,biblatex,xeCJK,ctex,polyglossia,fontspec,tikz,pdfbase,caption,graphics,xcolor,imakeidx,minted,fancyhdr,,!*?: }
 \gdef\use:package#1,{%
    \if :#1:\def\:temp##1!*?: {}\else
       \def\:temp{#1}\ifx \@currname\:temp
@@ -60,9 +60,14 @@
 \fi
 \def\:temp{eso-pic}\ifx \@currname\:temp
 \:dontusepackage{eso-pic}
-\newcommand\AddToShipoutPicture{\@ifstar{}{}}
+\newcommand\AddToShipoutPicture{\@ifstar\@gobble\@gobble}
 \let\AddToShipoutPictureBG\AddToShipoutPicture
 \let\AddToShipoutPictureFG\AddToShipoutPicture
+\let\ClearShipoutPictureBG\relax
+\let\ClearShipoutPictureFG\relax
+\let\ClearShipoutPicture\relax
+\providecommand*\LenToUnit[1]{}
+\newcommand\gridSetup[6][]{}
 \fi
 \def\:temp{showframe}\ifx \@currname\:temp
 \:dontusepackage{showframe}
@@ -114,6 +119,27 @@
   \xeuniuseblock{CJK}
 }
 \fi
+\def\:temp{ctex}\ifx \@currname\:temp
+\PassOptionsToPackage{fontset=none,autoindent=false}{ctex}
+\ExplSyntaxOn
+\let\o:file_input\file_input:n% patch \file_input:n to block
+                              % ctex-engine-luatex.def from loading
+\xdef\ctex:luaname{\detokenize{ctex-engine-luatex.def}}
+\def\:tempa#1{%
+  \edef\:tempb{#1}%
+  \ifx\:tempb\ctex:luaname%
+  % this macro is defined in the blocked file, just add dummy definition
+  \cs_new_protected:Npn \ctex_add_to_selectfont:n ##1{}%
+  \else%
+  \o:file_input{#1}%
+  \fi%
+}
+\let\file_input:n\:tempa
+\:AtEndOfPackage{%
+\let\file_input:n\o:file_input
+}
+\ExplSyntaxOff
+\fi
 \def\:temp{polyglossia}\ifx \@currname\:temp
 \ExplSyntaxOn
 \:AtEndOfPackage{