From 8a2d5b386a4d9f3b080f39af536208a7219a91e6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Nov 2022 17:30:58 +0000 Subject: \ContinuedFloat fixes, tex4ht r1247; slashbox support, tex4ht r1248; tablefootnote support, tex4ht r1249 git-svn-id: svn://tug.org/texlive/trunk@65089 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 14 +++++ .../source/generic/tex4ht/mktex4ht-cnf.tex | 4 +- .../source/generic/tex4ht/tex4ht-4ht.tex | 68 +++++++++++++++++++++- Master/texmf-dist/tex/generic/tex4ht/caption.4ht | 8 ++- Master/texmf-dist/tex/generic/tex4ht/slashbox.4ht | 29 +++++++++ .../tex/generic/tex4ht/tablefootnote.4ht | 25 ++++++++ .../texmf-dist/tex/generic/tex4ht/usepackage.4ht | 4 +- 7 files changed, 145 insertions(+), 7 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/tex4ht/slashbox.4ht create mode 100644 Master/texmf-dist/tex/generic/tex4ht/tablefootnote.4ht (limited to 'Master') diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 47acd724602..8de763410d3 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,17 @@ +2022-11-22 Michal Hoftich + + * tex4ht-4ht.tex (tablefootnote.4ht): added basic support for the + Tablefootnote package. + + * tex4ht-4ht.tex (slashbox.4ht): added basic support for the + Slashbox package. + + * tex4ht-4ht.tex (glossaries.4ht): removed spurious tags from the + glossary. + + * tex4ht-4ht.tex (caption.4ht): fixed support for the + \ContinuedFloat command. + 2022-11-21 Michal Hoftich * tex4ht-4ht.tex (biblatex.4ht): removed spurious space from in text diff --git a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex index 80aac32c781..6b5a059d661 100644 --- a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex +++ b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex @@ -1,4 +1,4 @@ -% $Id: mktex4ht-cnf.tex 1241 2022-11-17 18:48:36Z michal_h21 $ +% $Id: mktex4ht-cnf.tex 1249 2022-11-22 16:53:24Z michal_h21 $ % Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex. % Read by tex4ht-cond4ht. % @@ -308,6 +308,7 @@ \AddFile{9}{ProTex} \AddFile{9}{th4} \AddFile{9}{footmisc} +\AddFile{9}{tablefootnote} \AddFile{9}{writer} \AddFile{9}{mdwlist} \AddFile{9}{sverb} @@ -372,6 +373,7 @@ \AddFile{9}{framed} \AddFile{9}{mdframed} \AddFile{9}{tcolorbox} +\AddFile{9}{slashbox} \AddFile{9}{parallel} \AddFile{9}{skak} \AddFile{9}{chessboard} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index d7e023a1323..9939950dab8 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 1246 2022-11-21 21:00:44Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1249 2022-11-22 16:53:24Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -12343,17 +12343,26 @@ different. We should keep the separator selected by the user. \<<< \long\def\@makecaption#1#2{% + |% \caption@make@above% \cptA:\caption@@make{\cap:ref{#1}}{\cptC:#2}\cptD:% \caption@make@below% } \long\def\caption@makecaption#1#2{% + |% \caption@make@above% \cptA:\caption@@make{\cap:ref{#1}}{\cptC:#2}\cptD:% \caption@make@below% } >>> +This definition should fix support for the \''ContinedFloat' command. +Without it, we can get an error message that the current float type +is different than the one to be continued. + +\<<< +\xdef\continuedfloat@captype{\@captype}>>> + Caption's version of addcontentsline doesn't prevent expansion of macros, which may lead to errors when for example \''\%' is used. The use of detokenize should prevent this issue. @@ -13039,6 +13048,7 @@ The above doesn't work always. Try % Copyright (C) |CopyYear.2008. Eitan M. Gurari % | | +| \Hinput{glossaries} \endinput >>> \AddFile{6}{glossaries} @@ -13066,6 +13076,18 @@ The above doesn't work always. Try \HLet\@gls@removespaces\:tempc >>> +This should fix wrong handling of paragraphs in glossary. +The problem is that extra paragraph is inserted +when a new letter is started. + +\<<< +\Configure{@begin}{theglossary}{ + \Configure{theindex}{}{}{}{}{}{}{}{}{}{} + \def\idx:item{\SaveEverypar\ht:everypar{}} + \let\end:theidx\empty +} +>>> + %%%%%%%%%%%%%%%%%% \Section{Glossary} %%%%%%%%%%%%%%%%%% @@ -27932,6 +27954,27 @@ This code fixes nameref support in Tcolorbox. } >>> +%%%%%%%%%%%%%%%%%%%%%%% +\Section{slashbox} +%%%%%%%%%%%%%%%%%%%%%%% +\<<< +% slashbox.4ht (|version), generated from |jobname.tex +% Copyright 2022 TeX Users Group +| +| +\Hinput{slashbox} +\endinput +>>> \AddFile{9}{slashbox} + +\<<< +\NewConfigure{slashbox}{2} +\def\:tempa[#1][#2]#3#4{\a:slashbox\o:@@@slashbox:[#1][#2]{#3}{#4}\b:slashbox} + +\HLet\@@@slashbox\:tempa +\Configure{slashbox}{\Picture+{}}{\EndPicture} +>>> + + %%%%%%%%%%%%%%%%%%%%%%% \Section{dvipsnam} %%%%%%%%%%%%%%%%%%%%%%% @@ -36138,6 +36181,29 @@ Use \endinput >>> \AddFile{9}{footmisc} +%%%%%%%%%%%%%%% +\Section{tablefootnote} +%%%%%%%%%%%%%%%%% + +\<<< +% tablefootnote.4ht (|version), generated from |jobname.tex +% Copyright 2022 TeX Users Group +| +| +\Hinput{tablefootnote} +\endinput +>>> \AddFile{9}{tablefootnote} + +The \''\tablefootnote| command tries to print list of footnotes +at the end of a table where they were used. I haven't found +a good way how to do this in TeX4ht, so we just use normal footnote +instead. + +\<<< +\let\tablefootnote\footnote +>>> + + %%%%%%%%%%%%%%% \Section{Other} %%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/caption.4ht b/Master/texmf-dist/tex/generic/tex4ht/caption.4ht index 7010e638732..09501b5ff32 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/caption.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/caption.4ht @@ -1,6 +1,6 @@ -% caption.4ht (2021-10-19-14:11), generated from tex4ht-4ht.tex +% caption.4ht (2022-11-22-14:29), generated from tex4ht-4ht.tex % Copyright 2007-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-11-22-14:29} \let\sv:toclof\toclof \def\toclof#1#2#3{% @@ -46,11 +46,13 @@ } \long\def\@makecaption#1#2{% + \xdef\continuedfloat@captype{\@captype}% \caption@make@above% \cptA:\caption@@make{\cap:ref{#1}}{\cptC:#2}\cptD:% \caption@make@below% } \long\def\caption@makecaption#1#2{% + \xdef\continuedfloat@captype{\@captype}% \caption@make@above% \cptA:\caption@@make{\cap:ref{#1}}{\cptC:#2}\cptD:% \caption@make@below% diff --git a/Master/texmf-dist/tex/generic/tex4ht/slashbox.4ht b/Master/texmf-dist/tex/generic/tex4ht/slashbox.4ht new file mode 100644 index 00000000000..b04fd31e8e0 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/slashbox.4ht @@ -0,0 +1,29 @@ +% slashbox.4ht (2022-11-22-14:29), generated from tex4ht-4ht.tex +% Copyright 2022 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. +\immediate\write-1{version 2022-11-22-14:29} + +\NewConfigure{slashbox}{2} +\def\:tempa[#1][#2]#3#4{\a:slashbox\o:@@@slashbox:[#1][#2]{#3}{#4}\b:slashbox} + +\HLet\@@@slashbox\:tempa +\Configure{slashbox}{\Picture+{}}{\EndPicture} + +\Hinput{slashbox} +\endinput + diff --git a/Master/texmf-dist/tex/generic/tex4ht/tablefootnote.4ht b/Master/texmf-dist/tex/generic/tex4ht/tablefootnote.4ht new file mode 100644 index 00000000000..caa526697e1 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/tablefootnote.4ht @@ -0,0 +1,25 @@ +% tablefootnote.4ht (2022-11-22-14:29), generated from tex4ht-4ht.tex +% Copyright 2022 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. +\immediate\write-1{version 2022-11-22-14:29} + +\let\tablefootnote\footnote + +\Hinput{tablefootnote} +\endinput + diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index 8f61c0ef9de..454125bf3ac 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 (2022-11-17-13:27), generated from tex4ht-4ht.tex +% usepackage.4ht (2022-11-22-14:29), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-11-17-13:27} +\immediate\write-1{version 2022-11-22-14:29} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} -- cgit v1.2.3