texlive[73039] Master/texmf-dist: glossaries formatting, tex4ht
commits+karl at tug.org
commits+karl at tug.org
Wed Dec 4 22:55:18 CET 2024
Revision: 73039
https://tug.org/svn/texlive?view=revision&revision=73039
Author: karl
Date: 2024-12-04 22:55:18 +0100 (Wed, 04 Dec 2024)
Log Message:
-----------
glossaries formatting, tex4ht r1609; mathml new para after eqn, tex4ht r1610; manyfoot spurious space, tex4ht r1611
Revision Links:
--------------
https://tug.org/svn/texlive?view=revision&revision=1609
https://tug.org/svn/texlive?view=revision&revision=1610
https://tug.org/svn/texlive?view=revision&revision=1611
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/tex/generic/tex4ht/glossaries.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/manyfoot.4ht
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2024-12-04 21:31:52 UTC (rev 73038)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2024-12-04 21:55:18 UTC (rev 73039)
@@ -1,3 +1,18 @@
+2024-12-04 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-4ht.tex (manyfoot.4ht): fixed spurious space in footnotes
+ cuased by missing comment at the end of a line.
+ https://tex.stackexchange.com/a/731038/2891
+
+ * tex4ht-mathml.tex (html-mml.4ht): force new paragraph after
+ equation.
+ https://github.com/michal-h21/make4ht/issues/159
+
+ * tex4ht-4ht.tex (glossaries.4ht),
+ * tex4ht-html4.tex (html4.4ht): added formatting for glossary
+ entries.
+ https://tex.stackexchange.com/a/732132/2891
+
2024-12-03 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-4ht.tex (latex.4ht): fixed picture support for characters
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2024-12-04 21:31:52 UTC (rev 73038)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2024-12-04 21:55:18 UTC (rev 73039)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1608 2024-12-03 12:43:17Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1611 2024-12-04 20:42:25Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2024 TeX Users Group
@@ -13912,6 +13912,23 @@
\HLet\@gls at removespaces\:tempc
>>>
+Add formatting for glossary entries:
+
+\<config glossaries\><<<
+\NewConfigure{glossentry}{2}
+
+% Add formatting for glossary entries only if the environment used for printing
+% is not description. It would lead to errors otherwise.
+\def\:glsdescriptionname{description}
+\def\:tempa#1{\ifx\@currenvir\:glsdescriptionname\o:glossentry:{#1}\else\a:glossentry\o:glossentry:{#1}\b:glossentry\fi}
+\HLet\glossentry\:tempa
+
+\NewConfigure{glsgroupskip}{1}
+\def\:tempa{\a:glsgroupskip}
+\HLet\glsgroupskip\:tempa
+
+>>>
+
This should fix wrong handling of paragraphs in glossary.
The problem is that extra paragraph is inserted
when a new letter is started.
@@ -38676,7 +38693,7 @@
\edef\minipageNum{\minipageNum #1}%
\renewcommand\thefootnote{\csname thefootnote#1\endcsname}%
% declare which counter should be used
- \def\@mpfn{footnote#1}
+ \def\@mpfn{footnote#1}%
\footnote{##1}%
\let\thefootnote\:origthefootnote%
\let\@mpfn\:origmpfn%
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex 2024-12-04 21:31:52 UTC (rev 73038)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex 2024-12-04 21:55:18 UTC (rev 73039)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1606 2024-12-01 20:54:15Z michal_h21 $
+% $Id: tex4ht-html4.tex 1609 2024-12-04 11:44:50Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -4723,7 +4723,22 @@
\Configure{gloskip}{long}{\cr\HCode{<p class="gloskip"></p>}}
>>>
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section{Glossaries}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\<configure html4 glossaries\><<<
+\Configure{glossentry}
+{\ifvmode\IgnorePar\fi\EndP\HCode{<div class="glossary">}}
+{\ifvmode\IgnorePar\fi\EndP\HCode{</div>}}
+
+\Configure{glsgroupskip}{\ifvmode\Ignore\Par\fi\EndP\HCode{<div class="glsgroupskip"></div>\Hnewline}}
+\Css{.glsgroupskip{margin-bottom:1rem;}}
+\Css{.glsgroupskip + .glsgroupskip{margin-bottom: 0;}}
+>>>
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Captions}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/glossaries.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/glossaries.4ht 2024-12-04 21:31:52 UTC (rev 73038)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/glossaries.4ht 2024-12-04 21:55:18 UTC (rev 73039)
@@ -1,12 +1,12 @@
-% glossaries.4ht (2022-12-04-09:02), generated from tex4ht-4ht.tex
+% glossaries.4ht (2024-12-04-13:41), generated from tex4ht-4ht.tex
% Copyright 2008-2009 Eitan M. Gurari
-% Copyright 2009-2022 TeX Users Group
+% Copyright 2009-2024 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
+% https://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.
%
@@ -13,11 +13,11 @@
% This work has the LPPL maintenance status "maintained".
%
% The Current Maintainer of this work
-% is the TeX4ht Project <http://tug.org/tex4ht>.
+% is the TeX4ht Project <https://tug.org/tex4ht>.
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-12-04-09:02}
+\immediate\write-1{version 2024-12-04-13:41}
\def\:tempc#1#2{\Link{#1}{}#2\EndLink}
\HLet\@glslink\:tempc
@@ -39,7 +39,19 @@
\fi
}
\HLet\@gls at removespaces\:tempc
+\NewConfigure{glossentry}{2}
+% Add formatting for glossary entries only if the environment used for printing
+% is not description. It would lead to errors otherwise.
+\def\:glsdescriptionname{description}
+\def\:tempa#1{\ifx\@currenvir\:glsdescriptionname\o:glossentry:{#1}\else\a:glossentry\o:glossentry:{#1}\b:glossentry\fi}
+\HLet\glossentry\:tempa
+
+\NewConfigure{glsgroupskip}{1}
+\def\:tempa{\a:glsgroupskip}
+\HLet\glsgroupskip\:tempa
+
+
\Configure{@begin}{theglossary}{
\Configure{theindex}{}{}{}{}{}{}{}{}{}{}
\def\idx:item{\SaveEverypar\ht:everypar{}}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht 2024-12-04 21:31:52 UTC (rev 73038)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht 2024-12-04 21:55:18 UTC (rev 73039)
@@ -1,4 +1,4 @@
-% html-mml.4ht (2024-08-11-08:31), generated from tex4ht-mathml.tex
+% html-mml.4ht (2024-12-04-13:41), generated from tex4ht-mathml.tex
% Copyright 2009-2024 TeX Users Group
% Copyright 1999-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-08-11-08:31}
+\immediate\write-1{version 2024-12-04-13:41}
\exit:ifnot{amsmath,%
array,%
@@ -756,7 +756,7 @@
\HCode{</td><td class="eq-no">}%
}
{\ifvmode \IgnorePar\fi\EndP \HCode{</td></tr></table>}%
- \ShowPar\IgnoreIndent\par}
+ \par\ShowPar\noindent}
\Configure{equation*}
{\ifvmode \IgnorePar\fi\EndP
\HCode{<table class="equation-star"><tr><td>}%
@@ -849,6 +849,8 @@
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{plain}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -904,7 +906,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{array}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1002,6 +1003,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{color}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1092,6 +1094,9 @@
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{rlbabel}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1139,7 +1144,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{frenchb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1209,6 +1213,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht 2024-12-04 21:31:52 UTC (rev 73038)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht 2024-12-04 21:55:18 UTC (rev 73039)
@@ -1,4 +1,4 @@
-% html4.4ht (2024-12-01-13:24), generated from tex4ht-html4.tex
+% html4.4ht (2024-12-04-13:41), generated from tex4ht-html4.tex
% Copyright 2009-2024 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 2024-12-01-13:24}
+\immediate\write-1{version 2024-12-04-13:41}
\exit:ifnot{8859-6,%
CJK,%
@@ -124,6 +124,7 @@
german,%
germanb,%
gloss,%
+glossaries,%
glossary,%
go,%
graphics,%
@@ -20581,8 +20582,23 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \ConfigureHinput{glossaries}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \Configure{glossentry}
+{\ifvmode\IgnorePar\fi\EndP\HCode{<div class="glossary">}}
+{\ifvmode\IgnorePar\fi\EndP\HCode{</div>}}
+\Configure{glsgroupskip}{\ifvmode\Ignore\Par\fi\EndP\HCode{<div class="glsgroupskip"></div>\Hnewline}}
+\Css{.glsgroupskip{margin-bottom:1rem;}}
+\Css{.glsgroupskip + .glsgroupskip{margin-bottom: 0;}}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{glossary}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\Configure{gloskip}{list}{\item[]\HCode{<p class="gloskip"></p>}}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/manyfoot.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/manyfoot.4ht 2024-12-04 21:31:52 UTC (rev 73038)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/manyfoot.4ht 2024-12-04 21:55:18 UTC (rev 73039)
@@ -1,4 +1,4 @@
-% manyfoot.4ht (2024-11-01-14:51), generated from tex4ht-4ht.tex
+% manyfoot.4ht (2024-12-04-13:41), generated from tex4ht-4ht.tex
% Copyright 2024 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-11-01-14:51}
+\immediate\write-1{version 2024-12-04-13:41}
More information about the tex-live-commits
mailing list.