summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-11-09 22:45:44 +0000
committerKarl Berry <karl@freefriends.org>2023-11-09 22:45:44 +0000
commitd03b7cb55c61ac5b3b7f2d22e1429fe0ef435c4f (patch)
tree265e17c6789a02013a2db1bb5cde02dce58deef8 /Master/texmf-dist/source
parent48ae35fd25a649352d80a3146ca4c7a84189550d (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
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog22
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex10
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex14
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex4
4 files changed, 43 insertions, 7 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|>