koma+odt subtitle support, tex4ht r996-997; spurious caption text, tex4ht r998

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

6 files changed, 150 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/caption.4ht b/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
index 789e51b9751..7010e638732 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
@@ -1,4 +1,4 @@
-% caption.4ht (2021-05-16-09:21), generated from tex4ht-4ht.tex
+% caption.4ht (2021-10-19-14:11), generated from tex4ht-4ht.tex
 % Copyright 2007-2009 Eitan M. Gurari
 % Copyright 2009-2021 TeX Users Group
 %
@@ -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 2021-10-19-14:11}
 
 \let\sv:toclof\toclof
 \def\toclof#1#2#3{%
@@ -56,7 +56,7 @@
   \caption@make@below%
 }
 
- \renewcommand*\caption@@@addcontentsline[5]{%
+ \renewcommand*\caption@@@addcontentsline[4]{%
    \def\temp{#1}\def\tempa{toc}\ifx \temp\tempa\else%
    \gHAdvance\TitleCount  1%
    \fi%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 499b35f0607..8b2e2e2c114 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 (2021-10-12-13:20), generated from tex4ht-html4.tex
+% html4.4ht (2021-10-19-14:11), generated from tex4ht-html4.tex
 % Copyright 2009-2021 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 2021-10-12-13:20}
+\immediate\write-1{version 2021-10-19-14:11}
 
 \exit:ifnot{8859-6,% 
 CJK,% 
@@ -32328,6 +32328,7 @@ description">}%
    {\ifvmode \IgnorePar\fi\EndP \HCode{<div class="dedication" >}}
    {\ifvmode \IgnorePar\fi\EndP \HCode{</div>}}
 \Css{div.dedication {text-align:center;}}
+\Css{div.titlepage{ margin-bottom: 2em; text-align:center; }}
 
 %  \Css{span.footnote-mark{ vertical-align: super }}
 \Css{span.footnote-mark   sup.textsuperscript,
@@ -32338,6 +32339,7 @@ description">}%
     \bgroup \IgnorePar\HCode{<h5 class="minisecHead"\a:LRdir>}%
     \TitleMark\space \HtmlParOff}
    {\HCode{</h5>}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar}
+\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{<div class="subtitle">}}{\HCode{</div>}}
 
 \ConfigureMark{subsection}
    {\ifnum \c:secnumdepth>\c@secnumdepth  \expandafter\:gobble
@@ -33014,6 +33016,7 @@ description">}%
     \bgroup \IgnorePar\HCode{<h5 class="minisecHead"\a:LRdir>}%
     \TitleMark\space \HtmlParOff}
    {\HCode{</h5>}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar}
+\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{<div class="subtitle">}}{\HCode{</div>}}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -33105,6 +33108,7 @@ description">}%
    {\ifvmode \IgnorePar\fi\EndP \HCode{<div class="dedication" >}}
    {\ifvmode \IgnorePar\fi\EndP \HCode{</div>}}
 \Css{div.dedication {text-align:center;}}
+\Css{div.titlepage{ margin-bottom: 2em; text-align:center; }}
 
 \ConfigureMark{chapter}
    {\HCode{<span class="titlemark">}\thechapter\HCode{</span>}\ \ }
@@ -33650,6 +33654,7 @@ description">}%
     \bgroup \IgnorePar\HCode{<h5 class="minisecHead"\a:LRdir>}%
     \TitleMark\space \HtmlParOff}
    {\HCode{</h5>}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar}
+\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{<div class="subtitle">}}{\HCode{</div>}}
 
 \ConfigureMark{subsection}
    {\ifnum \c:secnumdepth>\c@secnumdepth  \expandafter\:gobble
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index d76e5f55175..026f3989a9e 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
@@ -1,4 +1,4 @@
-% ooffice.4ht (2021-10-18-12:59), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2021-10-19-14:11), generated from tex4ht-ooffice.tex
 % Copyright 2009-2021 TeX Users Group
 % Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-10-18-12:59}
+\immediate\write-1{version 2021-10-19-14:11}
 
   \exit:ifnot{Preamble,% 
 algorithmicx,% 
@@ -13369,6 +13369,45 @@ Y{0178}\i{00EF}%
 </style:style>\Hnewline
 }
 
+\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{<text:p text:style-name="subtitle\if@rl-rtl\fi
+">}}{\HCode{</text:p>}}
+
+\NewConfigureOO{subtitle}
+\ConfigureOO{subtitle}{%
+<style:style style:name="subtitle"
+             style:family="paragraph"
+             style:parent-style-name="Heading"
+             style:next-style-name="author"
+             style:class="chapter">\Hnewline
+<style:paragraph-properties  fo:margin-top="0.42cm"
+                  fo:margin-bottom="0.51cm"
+                  fo:font-size="20pt"
+                  fo:font-weight="normal"
+                  style:font-size-asian="18pt"
+                  style:font-weight-asian="bold"
+                  style:font-size-complex="18pt"
+                  style:font-weight-complex="bold"
+                  fo:text-align="center"
+                  style:justify-single-word="false"/>
+</style:style> \Hnewline <style:style style:name="subtitle-rtl"
+             style:family="paragraph"
+             style:parent-style-name="Heading-rtl"
+             style:next-style-name="author-rtl"
+             style:class="chapter">\Hnewline
+<style:paragraph-properties  fo:margin-top="0.42cm"
+                  fo:margin-bottom="0.51cm"
+                  fo:font-size="20pt"
+                  fo:font-weight="normal"
+                  style:font-size-asian="18pt"
+                  style:font-weight-asian="bold"
+                  style:font-size-complex="18pt"
+                  style:font-weight-complex="bold"
+                  fo:text-align="center"
+                  style:justify-single-word="false"
+                  style:writing-mode="rl-tb" />
+</style:style> \Hnewline
+ }
+
 \NewConfigureOO{Contents 1}
 \ConfigureOO{Contents 1}{\Hnewline
    <style:style style:name="Contents-1"
@@ -14782,6 +14821,45 @@ Y{0178}\i{00EF}%
 </style:style>\Hnewline
 }
 
+\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{<text:p text:style-name="subtitle\if@rl-rtl\fi
+">}}{\HCode{</text:p>}}
+
+\NewConfigureOO{subtitle}
+\ConfigureOO{subtitle}{%
+<style:style style:name="subtitle"
+             style:family="paragraph"
+             style:parent-style-name="Heading"
+             style:next-style-name="author"
+             style:class="chapter">\Hnewline
+<style:paragraph-properties  fo:margin-top="0.42cm"
+                  fo:margin-bottom="0.51cm"
+                  fo:font-size="20pt"
+                  fo:font-weight="normal"
+                  style:font-size-asian="18pt"
+                  style:font-weight-asian="bold"
+                  style:font-size-complex="18pt"
+                  style:font-weight-complex="bold"
+                  fo:text-align="center"
+                  style:justify-single-word="false"/>
+</style:style> \Hnewline <style:style style:name="subtitle-rtl"
+             style:family="paragraph"
+             style:parent-style-name="Heading-rtl"
+             style:next-style-name="author-rtl"
+             style:class="chapter">\Hnewline
+<style:paragraph-properties  fo:margin-top="0.42cm"
+                  fo:margin-bottom="0.51cm"
+                  fo:font-size="20pt"
+                  fo:font-weight="normal"
+                  style:font-size-asian="18pt"
+                  style:font-weight-asian="bold"
+                  style:font-size-complex="18pt"
+                  style:font-weight-complex="bold"
+                  fo:text-align="center"
+                  style:justify-single-word="false"
+                  style:writing-mode="rl-tb" />
+</style:style> \Hnewline
+ }
+
 \ConfigureEnv{abstract}
    {\IgnorePar\EndP \bgroup
       \Configure{HtmlPar}
@@ -16071,6 +16149,45 @@ Y{0178}\i{00EF}%
 </style:style>\Hnewline
 }
 
+\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{<text:p text:style-name="subtitle\if@rl-rtl\fi
+">}}{\HCode{</text:p>}}
+
+\NewConfigureOO{subtitle}
+\ConfigureOO{subtitle}{%
+<style:style style:name="subtitle"
+             style:family="paragraph"
+             style:parent-style-name="Heading"
+             style:next-style-name="author"
+             style:class="chapter">\Hnewline
+<style:paragraph-properties  fo:margin-top="0.42cm"
+                  fo:margin-bottom="0.51cm"
+                  fo:font-size="20pt"
+                  fo:font-weight="normal"
+                  style:font-size-asian="18pt"
+                  style:font-weight-asian="bold"
+                  style:font-size-complex="18pt"
+                  style:font-weight-complex="bold"
+                  fo:text-align="center"
+                  style:justify-single-word="false"/>
+</style:style> \Hnewline <style:style style:name="subtitle-rtl"
+             style:family="paragraph"
+             style:parent-style-name="Heading-rtl"
+             style:next-style-name="author-rtl"
+             style:class="chapter">\Hnewline
+<style:paragraph-properties  fo:margin-top="0.42cm"
+                  fo:margin-bottom="0.51cm"
+                  fo:font-size="20pt"
+                  fo:font-weight="normal"
+                  style:font-size-asian="18pt"
+                  style:font-weight-asian="bold"
+                  style:font-size-complex="18pt"
+                  style:font-weight-complex="bold"
+                  fo:text-align="center"
+                  style:justify-single-word="false"
+                  style:writing-mode="rl-tb" />
+</style:style> \Hnewline
+ }
+
 \ConfigureEnv{abstract}
    {\IgnorePar\EndP \bgroup
       \Configure{HtmlPar}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrartcl.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrartcl.4ht
index 47fe65fb8b8..3f1a6354ebf 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/scrartcl.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/scrartcl.4ht
@@ -1,4 +1,4 @@
-% scrartcl.4ht (2021-10-10-14:01), generated from tex4ht-4ht.tex
+% scrartcl.4ht (2021-10-19-14:11), generated from tex4ht-4ht.tex
 % Copyright 1999-2009 Eitan M. Gurari
 % Copyright 2009-2021 TeX Users Group
 %
@@ -17,16 +17,23 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-10-10-14:01}
+\immediate\write-1{version 2021-10-19-14:11}
 
 
 \input article.4ht
 \Def:Section\minisec{}{#1}
 \let\:minisec=\minisec
 \def\minisec#1{\:minisec{#1}\@afterheading}
+\NewConfigure{subtitle}{2}
 \pend:defI\@makefntext{\IgnorePar}
 \let\scr@defineobsoletefonts\thr@@
 
+\pend:def\maketitle{%
+    \pend:def\@subtitle{\a:subtitle}
+  \append:def\@subtitle{\b:subtitle}
+
+}
+
 \Hinput{scrartcl}
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht
index fcf17c12127..50b5110759c 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht
@@ -1,4 +1,4 @@
-% scrbook.4ht (2021-10-10-14:01), generated from tex4ht-4ht.tex
+% scrbook.4ht (2021-10-19-14:11), generated from tex4ht-4ht.tex
 % Copyright 1999-2009 Eitan M. Gurari
 % Copyright 2009-2021 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-10-10-14:01}
+\immediate\write-1{version 2021-10-19-14:11}
 
 \let\o:maketitle:\maketitle
 \let\o:maketitle:\maketitle
@@ -71,6 +71,9 @@
    \pend:def\@author{\a:author}\append:def\@author{\b:author}%
    \pend:def\@date{\a:date}\append:def\@date{\b:date}%
    \def\and{\a:and}
+     \pend:def\@subtitle{\a:subtitle}
+  \append:def\@subtitle{\b:subtitle}
+
 }
 \NewConfigure{dedication}{2}
 
@@ -385,6 +388,7 @@ A script of the form
 \Def:Section\minisec{}{#1}
 \let\:minisec=\minisec
 \def\minisec#1{\:minisec{#1}\@afterheading}
+\NewConfigure{subtitle}{2}
 \pend:defI\@makefntext{\IgnorePar}
 \let\scr@defineobsoletefonts\thr@@
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht
index 169679088d9..8244962311f 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht
@@ -1,4 +1,4 @@
-% scrreprt.4ht (2021-10-10-14:01), generated from tex4ht-4ht.tex
+% scrreprt.4ht (2021-10-19-14:11), generated from tex4ht-4ht.tex
 % Copyright (C) 1999-2009 Eitan M. Gurari
 % Copyright 2009-2021 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-10-10-14:01}
+\immediate\write-1{version 2021-10-19-14:11}
 
 \let\o:maketitle:\maketitle
 \def\maketitle{\bgroup
@@ -66,6 +66,9 @@
       \pend:def\@dedication{\a:dedication}%
       \append:def\@dedication{\b:dedication}%
    \fi
+     \pend:def\@subtitle{\a:subtitle}
+  \append:def\@subtitle{\b:subtitle}
+
 }
 \NewConfigure{dedication}{2}
 
@@ -377,6 +380,7 @@ UnDFexyz}%
 \Def:Section\minisec{}{#1}
 \let\:minisec=\minisec
 \def\minisec#1{\:minisec{#1}\@afterheading}
+\NewConfigure{subtitle}{2}
 \pend:defI\@makefntext{\IgnorePar}
 \let\scr@defineobsoletefonts\thr@@