texlive[63170] Master/texmf-dist: longtable captions and ooffice fix,
commits+karl at tug.org
commits+karl at tug.org
Thu Apr 28 23:49:35 CEST 2022
Revision: 63170
http://tug.org/svn/texlive?view=revision&revision=63170
Author: karl
Date: 2022-04-28 23:49:35 +0200 (Thu, 28 Apr 2022)
Log Message:
-----------
longtable captions and ooffice fix, tex4ht r1121-2
Revision Links:
--------------
http://tug.org/svn/texlive?view=revision&revision=1121
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2022-04-28 20:29:50 UTC (rev 63169)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2022-04-28 21:49:35 UTC (rev 63170)
@@ -1,3 +1,12 @@
+2022-04-28 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-ooffice.tex (ooffice.4ht): added dummy definition of
+ \cell:style:name to prevent compilation error with longtable.
+ * tex4ht-4ht.tex (longtable.4ht),
+ * tex4ht-html4.tex (html4.4ht): fixed support for longtable
+ captions.
+ https://tex.stackexchange.com/a/642350/2891
+
2022-04-27 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-html4.tex (html4.4ht): corrected class names for Ulem
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2022-04-28 20:29:50 UTC (rev 63169)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2022-04-28 21:49:35 UTC (rev 63170)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1119 2022-04-26 15:53:45Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1121 2022-04-28 13:36:29Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -10150,6 +10150,12 @@
\o:noalign:\bgroup \gHAdvance\TitleCount 1
\@ifnextchar[{\egroup\LT at c@ption\@firstofone}\LT at capti@n}
\HLet\LT at caption\:tempc
+>>>
+
+
+\<old longtable makecaption\><<<
+% this code is not used anymore, it produces spurious table cells,
+% resulting in wrong structure
\def\:tempc#1#2#3{%
\LT at mcol\LT at cols c{\hbox{\parbox[t]\LTcapwidth{%
\cptA: #1{\cap:ref{#2}}\if\relax\detokenize{#1}\relax\else\cptB:\fi\cptC:#3\cptD:
@@ -10157,6 +10163,20 @@
\HLet\LT at makecaption\:tempc
>>>
+Captions in Longtable are placed inside of the table structure.
+We need to use special configuration to produce correct rendering,
+normal code for caption will not work.
+
+\Link[https://tex.stackexchange.com/a/642350/2891] More details\EndLink
+
+\<longtable captions\><<<
+\NewConfigure{longtablecaption}{4}
+\def\:tempc#1#2#3{%
+ \a:longtablecaption #1{\cap:ref{#2}}\if\relax\detokenize{#1}\relax\else\b:longtablecaption\fi\c:longtablecaption#3\d:longtablecaption
+ \endgraf\vskip\baselineskip}
+\HLet\LT at makecaption\:tempc
+>>>
+
\Link[https://puszcza.gnu.org.ua/bugs/?313]
Write table info to the LOT
\EndLink
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex 2022-04-28 20:29:50 UTC (rev 63169)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex 2022-04-28 21:49:35 UTC (rev 63170)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1120 2022-04-27 10:47:56Z michal_h21 $
+% $Id: tex4ht-html4.tex 1121 2022-04-28 13:36:29Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -8169,6 +8169,9 @@
\Css{div.longtable{text-align:center;}}
\Css{table.longtable{margin-left:auto; margin-right: auto;}}
\Configure{longtableparbox}{\IgnorePar\leavevmode\ShowPar\par}
+\Configure{longtablecaption}{\ifvmode\IgnorePar\fi\EndP\HCode{<caption class="longtable">}\par\ShowPar\HCode{<span class="id">}}{:\ }{\HCode{</span><span class="content">}}{\HCode{</span>}\ifvmode\IgnorePar\fi\EndP\HCode{</caption>}}
+
+\Css{caption.longtable .id{font-weight:bold;}}
>>>
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex 2022-04-28 20:29:50 UTC (rev 63169)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex 2022-04-28 21:49:35 UTC (rev 63170)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 1108 2022-04-05 15:59:08Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 1122 2022-04-28 15:04:04Z michal_h21 $
% compile 3 times: latex tex4ht-ooffice
% htlatex tex4ht-ooffice "xhtml,4,sections+"
%
@@ -11976,7 +11976,8 @@
{\HCode{<table:table-row \Hnewline}\halignTR\HCode{
table:style-name="TBL-\TableNo-\HRow-">}}
{\HCode{</table:table-row>}}
- {\HCode{<table:table-cell
+ {\edef\cell:style:name{}% suppress compilation error
+ \HCode{<table:table-cell
\ifnum \HMultispan>1 table:number-columns-spanned="\HMultispan"\fi
\space table:style-name="TBL-\TableNo-\HRow-\HCol" ><text:p>}|<td save EndP|>%
|<start array par box|>\PushStack\Table:Stck\TableNo}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht 2022-04-28 20:29:50 UTC (rev 63169)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht 2022-04-28 21:49:35 UTC (rev 63170)
@@ -1,4 +1,4 @@
-% html4.4ht (2022-04-27-13:58), generated from tex4ht-html4.tex
+% html4.4ht (2022-04-28-13:47), generated from tex4ht-html4.tex
% Copyright 2009-2022 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 2022-04-27-13:58}
+\immediate\write-1{version 2022-04-28-13:47}
\exit:ifnot{8859-6,%
CJK,%
@@ -21092,7 +21092,10 @@
\Css{div.longtable{text-align:center;}}
\Css{table.longtable{margin-left:auto; margin-right: auto;}}
\Configure{longtableparbox}{\IgnorePar\leavevmode\ShowPar\par}
+\Configure{longtablecaption}{\ifvmode\IgnorePar\fi\EndP\HCode{<caption class="longtable">}\par\ShowPar\HCode{<span class="id">}}{:\ }{\HCode{</span><span class="content">}}{\HCode{</span>}\ifvmode\IgnorePar\fi\EndP\HCode{</caption>}}
+\Css{caption.longtable .id{font-weight:bold;}}
+
\fi
\:CheckOption{pic-longtable} \if:Option
\ConfigureEnv{longtable}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht 2022-04-28 20:29:50 UTC (rev 63169)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht 2022-04-28 21:49:35 UTC (rev 63170)
@@ -1,6 +1,6 @@
-% longtable.4ht (2021-09-26-14:15), generated from tex4ht-4ht.tex
+% longtable.4ht (2022-04-28-13:47), 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-09-26-14:15}
+\immediate\write-1{version 2022-04-28-13:47}
\def\:tempc[#1]#2{%
\gHAdvance\float:cnt 1
@@ -226,10 +226,10 @@
\o:noalign:\bgroup \gHAdvance\TitleCount 1
\@ifnextchar[{\egroup\LT at c@ption\@firstofone}\LT at capti@n}
\HLet\LT at caption\:tempc
+\NewConfigure{longtablecaption}{4}
\def\:tempc#1#2#3{%
- \LT at mcol\LT at cols c{\hbox{\parbox[t]\LTcapwidth{%
- \cptA: #1{\cap:ref{#2}}\if\relax\detokenize{#1}\relax\else\cptB:\fi\cptC:#3\cptD:
- \endgraf\vskip\baselineskip}}}}
+ \a:longtablecaption #1{\cap:ref{#2}}\if\relax\detokenize{#1}\relax\else\b:longtablecaption\fi\c:longtablecaption#3\d:longtablecaption
+ \endgraf\vskip\baselineskip}
\HLet\LT at makecaption\:tempc
\def\:tempc#1[#2]#3{%
\LT at makecaption#1\fnum at table{#3}%
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2022-04-28 20:29:50 UTC (rev 63169)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2022-04-28 21:49:35 UTC (rev 63170)
@@ -1,4 +1,4 @@
-% ooffice.4ht (2022-04-05-13:34), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2022-04-28-13:47), generated from tex4ht-ooffice.tex
% Copyright 2009-2022 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 2022-04-05-13:34}
+\immediate\write-1{version 2022-04-28-13:47}
\exit:ifnot{Preamble,%
algorithmicx,%
@@ -8652,7 +8652,8 @@
{\HCode{<table:table-row \Hnewline}\halignTR\HCode{
table:style-name="TBL-\TableNo-\HRow-">}}
{\HCode{</table:table-row>}}
- {\HCode{<table:table-cell
+ {\edef\cell:style:name{}% suppress compilation error
+ \HCode{<table:table-cell
\ifnum \HMultispan>1 table:number-columns-spanned="\HMultispan"\fi
\space table:style-name="TBL-\TableNo-\HRow-\HCol" ><text:p>}\SaveEndP
%
@@ -13176,8 +13177,6 @@
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{verse}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13321,6 +13320,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{apacite}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19950,6 +19950,8 @@
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{footmisc}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20049,6 +20051,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{soul}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20185,7 +20188,6 @@
-
More information about the tex-live-commits
mailing list.