From 8a332606cb996f688cd1ef3517d43dfc3208e53e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 22 Feb 2022 23:14:32 +0000 Subject: tocdepth fix, texrht r1084 git-svn-id: svn://tug.org/texlive/trunk@62147 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 7 +++ .../source/generic/tex4ht/tex4ht-4ht.tex | 54 ++++++++++------------ Master/texmf-dist/tex/generic/tex4ht/article.4ht | 15 +++--- Master/texmf-dist/tex/generic/tex4ht/book.4ht | 15 +++--- Master/texmf-dist/tex/generic/tex4ht/mwart.4ht | 14 +++--- Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht | 14 +++--- Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht | 14 +++--- Master/texmf-dist/tex/generic/tex4ht/report.4ht | 15 +++--- Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht | 15 +++--- Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht | 13 +++--- 10 files changed, 87 insertions(+), 89 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index e051c4ff772..4bfe3f26b81 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,10 @@ +2022-02-22 Michal Hoftich + + * tex4ht-4ht.tex ( + article.4ht, book.4ht, mwart.4ht, mwbk.4ht, + mwrep.4ht, report.4ht, scrbook.4ht, scrreprt.4ht + ): corrected handling of the tocdepth counter. + 2022-02-19 Michal Hoftich * tex4ht-4ht.tex (hyperref-hooks.4ht): define autoref captions, so diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 8b2b3e86ace..b1a19e87f36 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1082 2022-02-19 21:28:26Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1084 2022-02-22 13:19:45Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -5179,7 +5179,7 @@ We can load nameref from the early hook file \<<< % hyperref-hooks.4ht (|version), generated from |jobname.tex -% Copyright 2021 TeX Users Group +% Copyright 2022 TeX Users Group | \:AtEndOfPackage{% | @@ -13900,12 +13900,11 @@ Do we need \`' \Configure{cite}{}{}{}{}%' in the following? \else \ifnum \c@tocdepth >\m@ne chapter,appendix,\fi \ifnum \c@tocdepth>0 section,\fi - \ifnum \c@tocdepth>1 subsection,\fi \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 +\ifnum \c@tocdepth>1 subsection,\fi +\ifnum \c@tocdepth>2 subsubsection,\fi +\ifnum \c@tocdepth>3 paragraph,\fi +\ifnum \c@tocdepth>4 subparagraph,\fi UnDFexyz>>> \Verbatim @@ -16185,12 +16184,11 @@ Hfootnote counter, which isn't declared. \else \ifnum \c@tocdepth >\m@ne chapter,appendix,\fi \ifnum \z@>\c@tocdepth\else section,\fi - \ifnum 1>\c@tocdepth \else 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 1>\c@tocdepth \else subsection,\fi +\ifnum 2>\c@tocdepth \else subsubsection,\fi +\ifnum 3>\c@tocdepth \else paragraph,\fi +\ifnum 4>\c@tocdepth \else subparagraph,\fi UnDFexyz}% \noexpand\fi} \def\:tableofcontents{\futurelet\:temp\:TOC} @@ -16387,10 +16385,10 @@ it introduces an error in the .xref file for each caption used in the document. \<<< \ifnum \c@tocdepth >-2 part,likepart,\fi \ifnum \c@tocdepth >\z@ section,likesection,\fi -\ifnum 2>\c@tocdepth \else subsection,likesubsection,\fi -\ifnum 3>\c@tocdepth \else subsubsection,likesubsubsection,\fi -\ifnum 4>\c@tocdepth \else paragraph,likeparagraph,\fi -\ifnum 5>\c@tocdepth \else subparagraph,likesubparagraph,\fi +\ifnum 1>\c@tocdepth \else subsection,likesubsection,\fi +\ifnum 2>\c@tocdepth \else subsubsection,likesubsubsection,\fi +\ifnum 3>\c@tocdepth \else paragraph,likeparagraph,\fi +\ifnum 4>\c@tocdepth \else subparagraph,likesubparagraph,\fi UnDFexyz>>> \<<< @@ -16582,10 +16580,10 @@ UnDFexyz>>> \ifnum \c@tocdepth >-2 part,likepart,\fi \ifnum \c@tocdepth >\m@ne chapter,likechapter,appendix,\fi \ifnum \z@>\c@tocdepth\else section,likesection,\fi -\ifnum 2>\c@tocdepth \else subsection,likesubsection,\fi -\ifnum 3>\c@tocdepth \else subsubsection,likesubsubsection,\fi -\ifnum 4>\c@tocdepth \else paragraph,likeparagraph,\fi -\ifnum 5>\c@tocdepth \else subparagraph,likesubparagraph,\fi +\ifnum 1>\c@tocdepth \else subsection,likesubsection,\fi +\ifnum 2>\c@tocdepth \else subsubsection,likesubsubsection,\fi +\ifnum 3>\c@tocdepth \else paragraph,likeparagraph,\fi +\ifnum 4>\c@tocdepth \else subparagraph,likesubparagraph,\fi UnDFexyz>>> \<<< @@ -17396,12 +17394,11 @@ Support for subtitles: \else \ifnum \c@tocdepth >\m@ne chapter,appendix,addchap,\fi \ifnum \c@tocdepth>0 section,\fi - \ifnum \c@tocdepth>1 subsection,\fi \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 +\ifnum \c@tocdepth>1 subsection,\fi +\ifnum \c@tocdepth>2 subsubsection,\fi +\ifnum \c@tocdepth>3 paragraph,\fi +\ifnum \c@tocdepth>4 subparagraph,\fi UnDFexyz}% \noexpand\fi} \def\:tableofcontents{\futurelet\:temp\:TOC} @@ -17792,10 +17789,9 @@ TeX4ht now loads before class files. We reuse the code used in Koma classes \ifnum \c@tocdepth >\m@ne chapter,appendix,addchap,\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 +\ifnum \c@tocdepth>2 subsubsection,\fi +\ifnum \c@tocdepth>3 paragraph,\fi +\ifnum \c@tocdepth>4 subparagraph,\fi UnDFexyz}% \noexpand\fi} \def\:tableofcontents{\futurelet\:temp\:TOC} diff --git a/Master/texmf-dist/tex/generic/tex4ht/article.4ht b/Master/texmf-dist/tex/generic/tex4ht/article.4ht index 6e652003897..9ce706f3fa6 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/article.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/article.4ht @@ -1,6 +1,6 @@ -% article.4ht (2021-05-16-09:21), generated from tex4ht-4ht.tex +% article.4ht (2022-02-22-13:25), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 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 2021-05-16-09:21} +\immediate\write-1{version 2022-02-22-13:25} \Configure{UndefinedSec}{likepart} @@ -151,12 +151,11 @@ A script of the form \else \ifnum \c@tocdepth >\m@ne chapter,appendix,\fi \ifnum \c@tocdepth>0 section,\fi - \ifnum \c@tocdepth>1 subsection,\fi \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 +\ifnum \c@tocdepth>1 subsection,\fi +\ifnum \c@tocdepth>2 subsubsection,\fi +\ifnum \c@tocdepth>3 paragraph,\fi +\ifnum \c@tocdepth>4 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 e2b0d4aca2e..d2c2c4ac8d1 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 (2021-05-16-09:21), generated from tex4ht-4ht.tex +% book.4ht (2022-02-22-13:25), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 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 2021-05-16-09:21} +\immediate\write-1{version 2022-02-22-13:25} \Configure{UndefinedSec}{likepart} \Configure{UndefinedSec}{likechapter} @@ -77,12 +77,11 @@ \else \ifnum \c@tocdepth >\m@ne chapter,appendix,\fi \ifnum \c@tocdepth>0 section,\fi - \ifnum \c@tocdepth>1 subsection,\fi \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 +\ifnum \c@tocdepth>1 subsection,\fi +\ifnum \c@tocdepth>2 subsubsection,\fi +\ifnum \c@tocdepth>3 paragraph,\fi +\ifnum \c@tocdepth>4 subparagraph,\fi UnDFexyz}% \noexpand\fi} \def\:tableofcontents{\futurelet\:temp\:TOC} diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht index 703e302ee50..872e83388aa 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht @@ -1,6 +1,6 @@ -% mwart.4ht (2021-07-06-14:22), generated from tex4ht-4ht.tex +% mwart.4ht (2022-02-22-13:25), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 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 2021-07-06-14:22} +\immediate\write-1{version 2022-02-22-13:25} \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} @@ -297,10 +297,10 @@ A script of the form \noexpand\else \noexpand\Auto:ent{\ifnum \c@tocdepth >-2 part,likepart,\fi \ifnum \c@tocdepth >\z@ section,likesection,\fi -\ifnum 2>\c@tocdepth \else subsection,likesubsection,\fi -\ifnum 3>\c@tocdepth \else subsubsection,likesubsubsection,\fi -\ifnum 4>\c@tocdepth \else paragraph,likeparagraph,\fi -\ifnum 5>\c@tocdepth \else subparagraph,likesubparagraph,\fi +\ifnum 1>\c@tocdepth \else subsection,likesubsection,\fi +\ifnum 2>\c@tocdepth \else subsubsection,likesubsubsection,\fi +\ifnum 3>\c@tocdepth \else paragraph,likeparagraph,\fi +\ifnum 4>\c@tocdepth \else subparagraph,likesubparagraph,\fi UnDFexyz}% \noexpand\fi} diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht index 09a828a4dfe..b6a377773c3 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht @@ -1,6 +1,6 @@ -% mwbk.4ht (2021-07-06-14:22), generated from tex4ht-4ht.tex +% mwbk.4ht (2022-02-22-13:25), generated from tex4ht-4ht.tex % Copyright (C) 2003-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 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 2021-07-06-14:22} +\immediate\write-1{version 2022-02-22-13:25} \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} @@ -310,10 +310,10 @@ A script of the form \noexpand\Auto:ent{\ifnum \c@tocdepth >-2 part,likepart,\fi \ifnum \c@tocdepth >\m@ne chapter,likechapter,appendix,\fi \ifnum \z@>\c@tocdepth\else section,likesection,\fi -\ifnum 2>\c@tocdepth \else subsection,likesubsection,\fi -\ifnum 3>\c@tocdepth \else subsubsection,likesubsubsection,\fi -\ifnum 4>\c@tocdepth \else paragraph,likeparagraph,\fi -\ifnum 5>\c@tocdepth \else subparagraph,likesubparagraph,\fi +\ifnum 1>\c@tocdepth \else subsection,likesubsection,\fi +\ifnum 2>\c@tocdepth \else subsubsection,likesubsubsection,\fi +\ifnum 3>\c@tocdepth \else paragraph,likeparagraph,\fi +\ifnum 4>\c@tocdepth \else subparagraph,likesubparagraph,\fi UnDFexyz}% \noexpand\fi} diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht index d942cd7ccdd..0a40dcb6571 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht @@ -1,6 +1,6 @@ -% mwrep.4ht (2021-07-06-14:22), generated from tex4ht-4ht.tex +% mwrep.4ht (2022-02-22-13:25), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 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 2021-07-06-14:22} +\immediate\write-1{version 2022-02-22-13:25} \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} @@ -310,10 +310,10 @@ A script of the form \noexpand\Auto:ent{\ifnum \c@tocdepth >-2 part,likepart,\fi \ifnum \c@tocdepth >\m@ne chapter,likechapter,appendix,\fi \ifnum \z@>\c@tocdepth\else section,likesection,\fi -\ifnum 2>\c@tocdepth \else subsection,likesubsection,\fi -\ifnum 3>\c@tocdepth \else subsubsection,likesubsubsection,\fi -\ifnum 4>\c@tocdepth \else paragraph,likeparagraph,\fi -\ifnum 5>\c@tocdepth \else subparagraph,likesubparagraph,\fi +\ifnum 1>\c@tocdepth \else subsection,likesubsection,\fi +\ifnum 2>\c@tocdepth \else subsubsection,likesubsubsection,\fi +\ifnum 3>\c@tocdepth \else paragraph,likeparagraph,\fi +\ifnum 4>\c@tocdepth \else subparagraph,likesubparagraph,\fi UnDFexyz}% \noexpand\fi} diff --git a/Master/texmf-dist/tex/generic/tex4ht/report.4ht b/Master/texmf-dist/tex/generic/tex4ht/report.4ht index 6ea5447b8b5..feb4bfc2a72 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/report.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/report.4ht @@ -1,6 +1,6 @@ -% report.4ht (2021-06-27-08:11), generated from tex4ht-4ht.tex +% report.4ht (2022-02-22-13:25), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 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 2021-06-27-08:11} +\immediate\write-1{version 2022-02-22-13:25} \Configure{UndefinedSec}{likepart} @@ -192,12 +192,11 @@ A script of the form \else \ifnum \c@tocdepth >\m@ne chapter,appendix,\fi \ifnum \c@tocdepth>0 section,\fi - \ifnum \c@tocdepth>1 subsection,\fi \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 +\ifnum \c@tocdepth>1 subsection,\fi +\ifnum \c@tocdepth>2 subsubsection,\fi +\ifnum \c@tocdepth>3 paragraph,\fi +\ifnum \c@tocdepth>4 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 50b5110759c..f38008dec50 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 (2021-10-19-14:11), generated from tex4ht-4ht.tex +% scrbook.4ht (2022-02-22-13:25), generated from tex4ht-4ht.tex % Copyright 1999-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 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 2021-10-19-14:11} +\immediate\write-1{version 2022-02-22-13:25} \let\o:maketitle:\maketitle \let\o:maketitle:\maketitle @@ -132,12 +132,11 @@ \else \ifnum \c@tocdepth >\m@ne chapter,appendix,addchap,\fi \ifnum \c@tocdepth>0 section,\fi - \ifnum \c@tocdepth>1 subsection,\fi \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 +\ifnum \c@tocdepth>1 subsection,\fi +\ifnum \c@tocdepth>2 subsubsection,\fi +\ifnum \c@tocdepth>3 paragraph,\fi +\ifnum \c@tocdepth>4 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 8244962311f..cd524a76221 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 (2021-10-19-14:11), generated from tex4ht-4ht.tex +% scrreprt.4ht (2022-02-22-13:25), generated from tex4ht-4ht.tex % Copyright (C) 1999-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 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 2021-10-19-14:11} +\immediate\write-1{version 2022-02-22-13:25} \let\o:maketitle:\maketitle \def\maketitle{\bgroup @@ -205,10 +205,9 @@ A script of the form \ifnum \c@tocdepth >\m@ne chapter,appendix,addchap,\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 +\ifnum \c@tocdepth>2 subsubsection,\fi +\ifnum \c@tocdepth>3 paragraph,\fi +\ifnum \c@tocdepth>4 subparagraph,\fi UnDFexyz}% \noexpand\fi} \def\:tableofcontents{\futurelet\:temp\:TOC} -- cgit v1.2.3