summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-12-16 22:25:07 +0000
committerKarl Berry <karl@freefriends.org>2022-12-16 22:25:07 +0000
commit13def4e91736916fb77c64ea39a852fa310a0904 (patch)
treeee3f9afa440196a819ec8b5fb55b56810410b50a /Master/texmf-dist/source/generic
parent2811b370a9db2922ccdd8b3a3619299ea3b759d1 (diff)
prevent duplicate toc, tex4ht r1268; \paragraph, \subparagraph numbering, tex4ht r1269
git-svn-id: svn://tug.org/texlive/trunk@65295 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog16
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex14
3 files changed, 30 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 451438c022c..c7e1a5855d6 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,19 @@
+2022-12-16 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-html4.tex (html4.4ht): fixed numbering of \paragraph and
+ \subparagraph in base classes.
+ https://tex.stackexchange.com/q/668713/2891
+
+ * tex4ht-4ht.tex (amsart.4ht, amsart.4ht, amsbook.4ht,
+ amsbook.4ht, amsproc.4ht, amsproc.4ht, article.4ht,
+ article.4ht, book.4ht, book.4ht, mwart.4ht, mwart.4ht,
+ mwbk.4ht, mwbk.4ht, mwrep.4ht, mwrep.4ht, report.4ht,
+ report.4ht, scrbook.4ht, scrbook.4ht, scrreprt.4ht,
+ scrreprt.4ht): prevent duplicate TOC printing with
+ \Configure{tableofcontents*} when \tableofcontents command is used
+ in the document.
+ https://tex.stackexchange.com/q/668713/2891
+
2022-12-15 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-mathml.tex (mathml.4ht): disable stretchy attribute for
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index f1288840d10..30a73224d34 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 1264 2022-12-11 15:00:58Z karl $
+% $Id: tex4ht-4ht.tex 1268 2022-12-16 15:18:27Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -15711,8 +15711,8 @@ any of the options is on.
\ifx \au:StartSec\:UnDef
\let\au:StartSec|=\:StartSec
\def\:StartSec{\:tableofcontents
- \global\let\auto:toc|=\:UnDef \:StartSec}%
- \pend:def\:tableofcontents{\gdef\:StartSec{\au:StartSec}}%
+ \global\let\auto:toc|=\:UnDef \global\let\:StartSec\au:StartSec\:StartSec}%
+ \pend:def\tableofcontents{\gdef\:StartSec{\au:StartSec}}%
\fi \fi
}
>>>
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index 0ee6765c008..38044106902 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1261 2022-12-09 16:06:10Z michal_h21 $
+% $Id: tex4ht-html4.tex 1269 2022-12-16 16:03:28Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -11101,8 +11101,13 @@ a \par b
\<latex shared paragraph config\><<<
+\ConfigureMark{paragraph}
+ {\ifnum \c:secnumdepth>\c@secnumdepth \expandafter\:gobble
+ \else
+ \HCode{<span class="titlemark">}\@seccntformat{paragraph}%
+ \HCode{</span>}\fi }
\Configure{paragraph}{}{}
- {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup\bf}
+ {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup\bf\TitleMark\space}
{\endgroup\HCode{</span>}\par\IgnorePar}
\Configure{likeparagraph}{}{}
{\ShowPar\IgnoreIndent\HCode{<span class="likeparagraphHead"\a:LRdir>}}
@@ -11112,7 +11117,10 @@ a \par b
>>>
\<latex config div 4.0t\><<<
-\ConfigureMark{subparagraph}{}
+\ConfigureMark{subparagraph}{\ifnum \c:secnumdepth>\c@secnumdepth \expandafter\:gobble
+ \else
+ \HCode{<span class="titlemark">}\@seccntformat{subparagraph}%
+ \HCode{</span>}\fi }
\Configure{subparagraph}{}{}
{\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup\bf
\TitleMark\space}