From dd8e3211dcf7fe2afbdf9b6a35652aa68d8b106f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 19 Oct 2021 21:55:50 +0000 Subject: 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 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 15 +++ .../source/generic/tex4ht/tex4ht-4ht.tex | 26 ++++- .../source/generic/tex4ht/tex4ht-html4.tex | 8 +- .../source/generic/tex4ht/tex4ht-ooffice.tex | 47 +++++++- Master/texmf-dist/tex/generic/tex4ht/caption.4ht | 6 +- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 9 +- Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht | 121 ++++++++++++++++++++- Master/texmf-dist/tex/generic/tex4ht/scrartcl.4ht | 11 +- Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht | 8 +- Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht | 8 +- 10 files changed, 241 insertions(+), 18 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index bf2b91b40d7..64fa3128d41 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,18 @@ +2021-10-19 Michal Hoftich + + * tex4ht-4ht.tex (caption.4ht): fixed number of parameters for + \caption@@@addcontentsline. + https://puszcza.gnu.org.ua/bugs/?532 + + * tex4ht-ooffice.tex (ooffice.4ht): added subtitle support. + https://puszcza.gnu.org.ua/bugs/?507 + + * tex4ht-html4.tex (html4.4ht): added subtitle support. + + * tex4ht-4ht.tex (scrartcl.4ht, scrbook.4ht, scrreprt.4ht): added support + for \subtitle command. + https://puszcza.gnu.org.ua/bugs/?507 + 2021-10-18 Michal Hoftich * tex4ht-html5.tex (html5.4ht): removed CSS declaration that prevented diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index a7621ecb95d..e751b79b5d5 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 991 2021-10-10 18:03:42Z michal_h21 $ +% $Id: tex4ht-4ht.tex 998 2021-10-19 15:53:25Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2021 TeX Users Group @@ -11596,7 +11596,7 @@ may lead to errors when for example \''\%' is used. The use of detokenize should prevent this issue. \<<< - \renewcommand*\caption@@@addcontentsline[5]{% + \renewcommand*\caption@@@addcontentsline[4]{% \def\temp{#1}\def\tempa{toc}\ifx \temp\tempa\else% \gHAdvance\TitleCount 1% \fi% @@ -16993,6 +16993,7 @@ See report at screnggu.tex | \input article.4ht | +| \Hinput{scrartcl} \endinput >>> \AddFile{9}{scrartcl} @@ -17035,6 +17036,7 @@ See report at screnggu.tex \pend:def\@dedication{\a:dedication}% \append:def\@dedication{\b:dedication}% \fi + | } \NewConfigure{dedication}{2} >>> @@ -17053,10 +17055,28 @@ See report at screnggu.tex \pend:def\@author{\a:author}\append:def\@author{\b:author}% \pend:def\@date{\a:date}\append:def\@date{\b:date}% \def\and{\a:and} + | } \NewConfigure{dedication}{2} >>> +Support for subtitles: + +\<<< +\NewConfigure{subtitle}{2} +>>> + +\<<< +\pend:def\maketitle{% + | +} +>>> + +\<<< + \pend:def\@subtitle{\a:subtitle} + \append:def\@subtitle{\b:subtitle} +>>> + %%%%%%%%%%%%%%%%%% \Section{TOC} %%%%%%%%%%%%%%%%%%% @@ -17122,7 +17142,7 @@ UnDFexyz}% } >>> -%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%% \Section{other} %%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index 15c1f88db88..e77a08d20c6 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 992 2021-10-12 12:17:53Z michal_h21 $ +% $Id: tex4ht-html4.tex 996 2021-10-19 08:41:34Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -6197,6 +6197,7 @@ thanks author date and>>> {\ifvmode \IgnorePar\fi\EndP \HCode{
}} {\ifvmode \IgnorePar\fi\EndP \HCode{
}} \Css{div.dedication {text-align:center;}} +\Css{div.titlepage{ margin-bottom: 2em; text-align:center; }} >>> @@ -10408,6 +10409,11 @@ need to change early the catcodes of `\verb'_' and `\verb'^'. {\HCode{}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar} >>> +Support for subtitle +\<<< +\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\HCode{
}} +>>> + \<<< \Configure{endlikeparagraph} {paragraph,subsubsection,likesubsubsection,subsection,% diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex index 6ee4b95cee6..411342a8997 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-ooffice.tex 995 2021-10-18 13:45:08Z michal_h21 $ +% $Id: tex4ht-ooffice.tex 997 2021-10-19 12:30:26Z michal_h21 $ % compile 3 times: latex tex4ht-ooffice % htlatex tex4ht-ooffice "xhtml,4,sections+" % @@ -1560,6 +1560,48 @@ when the files are ready for zipping. {\ifvmode \IgnorePar\fi\EndP \HCode{}} >>> +Koma classes have subtitle command and option. + +\<<< +\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{}}{\HCode{}} + +\NewConfigureOO{subtitle} +\ConfigureOO{subtitle}{% +\Hnewline + + \Hnewline \Hnewline + + \Hnewline + } +>>> + %%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Abstract} %%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -9075,6 +9117,7 @@ fn\the\c@footnote x\minipageNum \<<< | +| | | | @@ -9093,6 +9136,7 @@ fn\the\c@footnote x\minipageNum \<<< | +| | | | @@ -9111,6 +9155,7 @@ fn\the\c@footnote x\minipageNum \<<< | +| | | | 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{
}} {\ifvmode \IgnorePar\fi\EndP \HCode{
}} \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{
}% \TitleMark\space \HtmlParOff} {\HCode{
}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar} +\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\HCode{
}} \ConfigureMark{subsection} {\ifnum \c:secnumdepth>\c@secnumdepth \expandafter\:gobble @@ -33014,6 +33016,7 @@ description">}% \bgroup \IgnorePar\HCode{
}% \TitleMark\space \HtmlParOff} {\HCode{
}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar} +\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\HCode{
}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -33105,6 +33108,7 @@ description">}% {\ifvmode \IgnorePar\fi\EndP \HCode{
}} {\ifvmode \IgnorePar\fi\EndP \HCode{
}} \Css{div.dedication {text-align:center;}} +\Css{div.titlepage{ margin-bottom: 2em; text-align:center; }} \ConfigureMark{chapter} {\HCode{}\thechapter\HCode{}\ \ } @@ -33650,6 +33654,7 @@ description">}% \bgroup \IgnorePar\HCode{
}% \TitleMark\space \HtmlParOff} {\HCode{
}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar} +\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\HCode{
}} \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}% \Hnewline } +\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{}}{\HCode{}} + +\NewConfigureOO{subtitle} +\ConfigureOO{subtitle}{% +\Hnewline + + \Hnewline \Hnewline + + \Hnewline + } + \NewConfigureOO{Contents 1} \ConfigureOO{Contents 1}{\Hnewline \Hnewline } +\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{}}{\HCode{}} + +\NewConfigureOO{subtitle} +\ConfigureOO{subtitle}{% +\Hnewline + + \Hnewline \Hnewline + + \Hnewline + } + \ConfigureEnv{abstract} {\IgnorePar\EndP \bgroup \Configure{HtmlPar} @@ -16071,6 +16149,45 @@ Y{0178}\i{00EF}% \Hnewline } +\Configure{subtitle}{\ifvmode\IgnorePar\fi\EndP\HCode{}}{\HCode{}} + +\NewConfigureOO{subtitle} +\ConfigureOO{subtitle}{% +\Hnewline + + \Hnewline \Hnewline + + \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@@ -- cgit v1.2.3