diff options
author | Karl Berry <karl@freefriends.org> | 2023-11-09 22:45:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-11-09 22:45:44 +0000 |
commit | d03b7cb55c61ac5b3b7f2d22e1429fe0ef435c4f (patch) | |
tree | 265e17c6789a02013a2db1bb5cde02dce58deef8 | |
parent | 48ae35fd25a649352d80a3146ca4c7a84189550d (diff) |
\texttt for \vrb:tt, tex4ht r1404; \refname for scrartcl, tex4ht r1405; do not set array spaces to zero, tex4ht r1406; first rows of tables with p-width, tex4ht r1407
git-svn-id: svn://tug.org/texlive/trunk@68795 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/ChangeLog | 22 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 10 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex | 14 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/array.4ht | 53 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/latex.4ht | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht | 18 |
9 files changed, 108 insertions, 56 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 07a08e9511d..5d680632817 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,25 @@ +2023-11-09 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-html4.tex (html4.4ht): better detection of the first row in + tables with the "p-width" option. + https://github.com/michal-h21/make4ht/issues/114 + +2023-11-06 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (array.4ht,latex.4ht,revtex4.4ht): don't set array + spaces to zero. + https://puszcza.gnu.org.ua/bugs/?229 + +2023-11-03 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-ooffice.tex (ooffice.4ht): use \refname instead of \bibname + with the scrartcl class. + https://puszcza.gnu.org.ua/bugs/?172 + + * tex4ht-4ht.tex (latex.4ht): define \vrb:tt as \texttt. It was + originally \tt, but this command is deprecated in LaTeX. + https://puszcza.gnu.org.ua/bugs/?172 + 2023-11-02 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (tabu.4ht, usepackage.4ht): use Tabularx as a diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 1b247dcdf9d..beea54d7326 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 1403 2023-11-02 16:09:43Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1406 2023-11-06 15:17:44Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2023 TeX Users Group @@ -9857,8 +9857,11 @@ problematic for leading lines of some, but not all, kinds. \tabcolsep|=\the\tabcolsep \noexpand\fi }% \fi -\arrayrulewidth|=\z@ \doublerulesep|=\z@ -\arraycolsep|=\z@ \tabcolsep|=\z@ +% why did we set these variables to zero? it leads to wrong spacing +% in pictures. +% https://puszcza.gnu.org.ua/bugs/?229 +% \arrayrulewidth|=\z@ \doublerulesep|=\z@ +% \arraycolsep|=\z@ \tabcolsep|=\z@ \Configure{MkHalign} {\@array:a}% {\@array:b\ProperTrTrue}% @@ -14498,6 +14501,7 @@ it failed me. \let\\\space% \toc:lbl:idx} \def\endMkHalign{\EndMkHalign} +\let\vrb:tt\texttt \def\:protect{\vrb:tt \let\protect|=\@unexpandable@protect \let\ref|=\o:ref \more:no diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index c285ae3bede..fc0fe3bc749 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 1401 2023-11-01 11:17:59Z michal_h21 $ +% $Id: tex4ht-html4.tex 1407 2023-11-09 16:19:15Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -19990,9 +19990,19 @@ changes. \<configure html4 latex\><<< \:CheckOption{p-width} \if:Option + \HAssign\:hcolwidthtbl=0 + \gdef\:hcolwidthfirst{1} \ExplSyntaxOn \Configure{HColWidth} - {\ifnum\HRow=1% output CSS only on the first row, to prevent duplication + {% + % in some cases, the first \HRow is not 1, for example with \multicolumn + % see https://github.com/michal-h21/make4ht/issues/114 + % when we enter a new table, we will save the first row + \ifx\:hcolwidthtbl\TableNo\else + \global\let\:hcolwidthtbl=\TableNo + \global\let\:hcolwidthfirst=\HRow + \fi + \ifx\HRow\:hcolwidthfirst% output CSS only on the first row, to prevent duplication \tmp:dim=\fp_to_dim:n{\dim_to_fp:n{\HColWidth}/\f@size} \Css{\#TBL-\TableNo\space td:nth-child(\HCol)% CSS selects ID of the current table column {width:\strip@pt\tmp:dim em;}} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex index 5fd530f49b8..8db74a7ac6e 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 1393 2023-10-16 12:00:17Z michal_h21 $ +% $Id: tex4ht-ooffice.tex 1405 2023-11-03 10:47:49Z michal_h21 $ % compile 3 times: latex tex4ht-ooffice % htlatex tex4ht-ooffice "xhtml,4,sections+" % @@ -9319,7 +9319,7 @@ fn\the\c@footnote x\minipageNum |<scr subtitle|> |<scr abstract|> |<content styles|> -|<ooffice bib with bibname|> +|<ooffice bib with refname|> |<ooffice begin-end env|> |<basic scr ooffice sections|> |<basic ooffice section styles|> diff --git a/Master/texmf-dist/tex/generic/tex4ht/array.4ht b/Master/texmf-dist/tex/generic/tex4ht/array.4ht index fad7257e4f4..ef77bfb40cd 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/array.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/array.4ht @@ -1,31 +1,23 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% array.4ht 2009-05-21-09:32 % -% Copyright (C) 1997--2009 Eitan M. Gurari % -% % -% 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".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} - +% array.4ht 2023-11-09-13:34 % +% Copyright (C) 1997-2009 Eitan M. Gurari % +% Copyright 2009-2023 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 <http://tug.org/tex4ht>. +% +% If you modify this program, changing the +% version identification would be appreciated. \def\@tabular{\leavevmode \hbox \bgroup \:@tabular: $\col@sep\tabcolsep \let\d@llarbegin\begingroup @@ -73,8 +65,11 @@ \tabcolsep\the\tabcolsep \noexpand\fi }% \fi -\arrayrulewidth\z@ \doublerulesep\z@ -\arraycolsep\z@ \tabcolsep\z@ +% why did we set these variables to zero? it leads to wrong spacing +% in pictures. +% https://puszcza.gnu.org.ua/bugs/?229 +% \arrayrulewidth\z@ \doublerulesep\z@ +% \arraycolsep\z@ \tabcolsep\z@ \Configure{MkHalign} {\@array:a}% {\@array:b\ProperTrTrue}% diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index f3b83cf1f2a..6f5350877c7 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 (2023-11-01-13:29), generated from tex4ht-html4.tex +% html4.4ht (2023-11-09-13:34), generated from tex4ht-html4.tex % Copyright 2009-2023 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 2023-11-01-13:29} +\immediate\write-1{version 2023-11-09-13:34} \exit:ifnot{8859-6,% CJK,% @@ -3402,9 +3402,19 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% use the command line option `fonts'} \fi \:CheckOption{p-width} \if:Option + \HAssign\:hcolwidthtbl=0 + \gdef\:hcolwidthfirst{1} \ExplSyntaxOn \Configure{HColWidth} - {\ifnum\HRow=1% output CSS only on the first row, to prevent duplication + {% + % in some cases, the first \HRow is not 1, for example with \multicolumn + % see https://github.com/michal-h21/make4ht/issues/114 + % when we enter a new table, we will save the first row + \ifx\:hcolwidthtbl\TableNo\else + \global\let\:hcolwidthtbl=\TableNo + \global\let\:hcolwidthfirst=\HRow + \fi + \ifx\HRow\:hcolwidthfirst% output CSS only on the first row, to prevent duplication \tmp:dim=\fp_to_dim:n{\dim_to_fp:n{\HColWidth}/\f@size} \Css{\#TBL-\TableNo\space td:nth-child(\HCol)% CSS selects ID of the current table column {width:\strip@pt\tmp:dim em;}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht index ebf4c8e07d4..6d3fbeac2c2 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht @@ -1,4 +1,4 @@ -% latex.4ht (2023-10-24-13:47), generated from tex4ht-4ht.tex +% latex.4ht (2023-11-09-13:34), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari % Copyright 2009-2023 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2023-10-24-13:47} +\immediate\write-1{version 2023-11-09-13:34} \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi @@ -53,6 +53,7 @@ \let\\\space% \toc:lbl:idx} \def\endMkHalign{\EndMkHalign} +\let\vrb:tt\texttt \def\:protect{\vrb:tt \let\protect\@unexpandable@protect \let\ref\o:ref \more:no @@ -1169,8 +1170,11 @@ $\vcenter \tabcolsep\the\tabcolsep \noexpand\fi }% \fi -\arrayrulewidth\z@ \doublerulesep\z@ -\arraycolsep\z@ \tabcolsep\z@ +% why did we set these variables to zero? it leads to wrong spacing +% in pictures. +% https://puszcza.gnu.org.ua/bugs/?229 +% \arrayrulewidth\z@ \doublerulesep\z@ +% \arraycolsep\z@ \tabcolsep\z@ \Configure{MkHalign} {\@array:a}% {\@array:b\ProperTrTrue}% @@ -2325,7 +2329,7 @@ $\vcenter \expandafter\:temp\usepackage!*?: \def\:tempa{\@latex@e@error} \ifx \:temp\:tempa - % latex209.4ht (2023-10-24-13:47), generated from tex4ht-4ht.tex + % latex209.4ht (2023-11-09-13:34), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari % Copyright 2009-2023 TeX Users Group % @@ -2344,7 +2348,7 @@ $\vcenter % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2023-10-24-13:47} +\immediate\write-1{version 2023-11-09-13:34} \let\:fnsymbol\@fnsymbol \def\@fnsymbol#1{{\hbox{$\:fnsymbol{#1}$}}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht index 50085a23c23..0d3c8101928 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 (2023-10-16-13:09), generated from tex4ht-ooffice.tex +% ooffice.4ht (2023-11-09-13:34), generated from tex4ht-ooffice.tex % Copyright 2009-2023 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 2023-10-16-13:09} +\immediate\write-1{version 2023-11-09-13:34} \exit:ifnot{Preamble,% algorithmicx,% @@ -13183,6 +13183,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{verse} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -13328,6 +13329,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{apacite} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -15292,7 +15294,7 @@ Y{0178}\i{00EF}% \Hnewline} % -\def\ref:name{\bibname} +\def\ref:name{\refname} \HAssign\bib:N=0 \:CheckOption{bib-}\if:Option \ConfigureList{thebibliography}% @@ -19974,7 +19976,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{footmisc} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -20075,6 +20076,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{soul} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -20226,7 +20228,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{framed} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht b/Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht index 48da065ba28..50757041a71 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht @@ -1,4 +1,4 @@ -% revtex4.4ht (2023-04-10-13:46), generated from tex4ht-4ht.tex +% revtex4.4ht (2023-11-09-13:34), generated from tex4ht-4ht.tex % Copyright 2002-2009 Eitan M. Gurari % Copyright 2009-2023 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2023-04-10-13:46} +\immediate\write-1{version 2023-11-09-13:34} \def\:tempc[#1]#2{% %\hshow{@array@array@new--222}% @@ -56,8 +56,11 @@ \tabcolsep\the\tabcolsep \noexpand\fi }% \fi -\arrayrulewidth\z@ \doublerulesep\z@ -\arraycolsep\z@ \tabcolsep\z@ +% why did we set these variables to zero? it leads to wrong spacing +% in pictures. +% https://puszcza.gnu.org.ua/bugs/?229 +% \arrayrulewidth\z@ \doublerulesep\z@ +% \arraycolsep\z@ \tabcolsep\z@ \Configure{MkHalign} {\@array:a}% {\@array:b\ProperTrTrue}% @@ -137,8 +140,11 @@ \tabcolsep\the\tabcolsep \noexpand\fi }% \fi -\arrayrulewidth\z@ \doublerulesep\z@ -\arraycolsep\z@ \tabcolsep\z@ +% why did we set these variables to zero? it leads to wrong spacing +% in pictures. +% https://puszcza.gnu.org.ua/bugs/?229 +% \arrayrulewidth\z@ \doublerulesep\z@ +% \arraycolsep\z@ \tabcolsep\z@ \Configure{MkHalign} {\@array:a}% {\@array:b\ProperTrTrue}% |