commit: 001fb530760d3b7ce38add7ce8c00706465cd30b Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Thu Oct 2 18:19:15 2025 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Thu Oct 2 20:47:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001fb530
dev-tex/tex4ht: Fix invalid html in longtable captions Bug: https://puszcza.gnu.org.ua/bugs/?315 Bug: https://bugs.gentoo.org/963668 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> .../files/tex4ht-20240311_p72882-longtable.patch | 34 +++++ dev-tex/tex4ht/tex4ht-20240311_p72882-r1.ebuild | 163 +++++++++++++++++++++ 2 files changed, 197 insertions(+) diff --git a/dev-tex/tex4ht/files/tex4ht-20240311_p72882-longtable.patch b/dev-tex/tex4ht/files/tex4ht-20240311_p72882-longtable.patch new file mode 100644 index 000000000000..557231b633f8 --- /dev/null +++ b/dev-tex/tex4ht/files/tex4ht-20240311_p72882-longtable.patch @@ -0,0 +1,34 @@ +Fix invalid html in longtable captions +https://puszcza.gnu.org.ua/bugs/?315 +https://bugs.gentoo.org/963668 + +r1745 | michal_h21 | 2025-10-01 13:41:06 +0200 (Wed, 01 Oct 2025) | 1 line +don't put longtable caption inside <tr> + +r1747 | michal_h21 | 2025-10-02 12:35:43 +0200 (Thu, 02 Oct 2025) | 1 line +prevent p end tags in logntable captions + +--- a/texmf/tex/generic/tex4ht/longtable.4ht ++++ b/texmf/tex/generic/tex4ht/longtable.4ht +@@ -211,8 +211,8 @@ + \HLet\LT@caption\:tempc + \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 <- this caused error in https://tex.stackexchange.com/q/682383/2891 ++ \o:noalign:{\a:longtablecaption #1{\cap:ref{#2}}\if\relax\detokenize{#1}\relax\else\b:longtablecaption\fi\c:longtablecaption#3\d:longtablecaption ++ \endgraf}%\vskip\baselineskip <- this caused error in https://tex.stackexchange.com/q/682383/2891 + } + \HLet\LT@makecaption\:tempc + \def\:tempc#1[#2]#3{% +--- a/texmf/tex/generic/tex4ht/html4.4ht ++++ b/texmf/tex/generic/tex4ht/html4.4ht +@@ -21237,7 +21237,7 @@ + \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>}} ++\Configure{longtablecaption}{\ifvmode\IgnorePar\fi\HCode{<caption class="longtable">}\HCode{<span class="id">}}{:\ }{\HCode{</span><span class="content">}}{\HCode{</span>}\ifvmode\IgnorePar\fi\HCode{</caption>}} + + \Css{caption.longtable .id{font-weight:bold;}} + diff --git a/dev-tex/tex4ht/tex4ht-20240311_p72882-r1.ebuild b/dev-tex/tex4ht/tex4ht-20240311_p72882-r1.ebuild new file mode 100644 index 000000000000..e096dd34512d --- /dev/null +++ b/dev-tex/tex4ht/tex4ht-20240311_p72882-r1.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic readme.gentoo-r1 + +MY_P_TEXLIVE="${PN}.r$(ver_cut 3).tar.xz" +MY_P_TEXLIVE_DOC="${PN}.doc.r$(ver_cut 3).tar.xz" +MY_P_TEXLIVE_SRC="${PN}.source.r$(ver_cut 3).tar.xz" + +DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org" +HOMEPAGE=" + https://tug.org/tex4ht/ + https://puszcza.gnu.org.ua/projects/tex4ht/ +" +# See bootstrap-tex4ht in tex.git on how to create the tex4ht-sources-<NUM>.tar.xz +SRC_URI=" + https://dev.gentoo.org/~flow/distfiles/texlive/tex4ht-sources-1477.tar.xz + https://mirrors.ctan.org/systems/texlive/tlnet/archive/${MY_P_TEXLIVE} + https://dev.gentoo.org/~flow/distfiles/texlive/${MY_P_TEXLIVE} + source? ( + https://mirrors.ctan.org/systems/texlive/tlnet/archive/${MY_P_TEXLIVE_SRC} + https://dev.gentoo.org/~flow/distfiles/texlive/${MY_P_TEXLIVE_SRC} + ) + doc? ( + https://mirrors.ctan.org/systems/texlive/tlnet/archive/${MY_P_TEXLIVE_DOC} + https://dev.gentoo.org/~flow/distfiles/texlive/${MY_P_TEXLIVE_DOC} + ) +" +S="${WORKDIR}" + +LICENSE="LPPL-1.2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="doc java source" + +COMMON_DEPEND=" + dev-libs/kpathsea:= +" + +RDEPEND=" + ${COMMON_DEPEND} + app-text/ghostscript-gpl + dev-lang/perl + media-gfx/imagemagick + java? ( >=virtual/jre-1.8:* ) +" + +DEPEND=" + ${COMMON_DEPEND} + java? ( >=virtual/jdk-1.8:* ) +" + +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${P}-longtable.patch" ) + +src_prepare() { + mv texmf-dist texmf || die + default + cd "${S}/texmf/tex4ht/base/unix" || die + sed -i \ + -e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \ + -e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf-dist/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!\nt${EPREFIX}${TEXMF}/fonts/tfm/!#" \ + -e "s#%%~#${EPREFIX}${TEXMF}#g" \ + tex4ht.env \ + || die "sed of tex4ht.env failed" + + einfo "Removing precompiled java stuff" + rm "${S}/texmf/tex4ht/bin/tex4ht.jar" +} + +src_compile() { + has_version '>=dev-libs/kpathsea-6.2.1' \ + && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)" + + pushd c > /dev/null || die + einfo "Compiling postprocessor sources..." + for f in tex4ht t4ht; do + $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \ + -DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \ + -DANSI -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \ + || die "Compiling $f failed" + done + popd > /dev/null || die + + if use java; then + pushd java > /dev/null || die + einfo "Compiling java files..." + ejavac *.java tex4ht/*.java xtpipes/*.java xtpipes/util/*.java + rm *.java tex4ht/*.java xtpipes/*.java xtpipes/util/*.java || die + # Create the jar needed by oolatex + jar -cf "${S}/${PN}.jar" * || die "failed to create jar" + popd > /dev/null || die + fi +} + +src_install() { + # install the binaries + dobin "c/tex4ht" "c/t4ht" + # install the scripts + if ! use java; then + rm -f "${S}"/bin/unix/oo* || die + rm -f "${S}"/bin/unix/jh* || die + fi + newbin texmf/scripts/tex4ht/mk4ht.pl mk4ht + + # install the .4ht scripts + insinto ${TEXMF}/tex/generic/tex4ht + doins "${S}"/texmf/tex/generic/tex4ht/* + + if use doc; then + # install the documentation + insinto ${TEXMF}/doc/generic/tex4ht + doins "${S}"/texmf/doc/generic/tex4ht/* + fi + + if use source; then + insinto ${TEXMF}/source/generic/tex4ht + doins "${S}"/texmf/source/generic/tex4ht/* + fi + + # install the special htf fonts + insinto ${TEXMF}/tex4ht + doins -r "${S}/texmf/tex4ht/ht-fonts" + + if use java; then + # install the java files + doins -r "${S}/texmf/tex4ht/bin" + java-pkg_jarinto ${TEXMF}/tex4ht/bin + java-pkg_dojar "${S}/${PN}.jar" + fi + + # install the .4xt files + doins -r "${S}/texmf/tex4ht/xtpipes" + + # install the env file + insinto ${TEXMF}/tex4ht/base + newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env + + insinto /etc/texmf/texmf.d + doins "${FILESDIR}/50tex4ht.cnf" + + insinto ${TEXMF}/tex/generic/${PN} + insopts -m755 + local script_name + for script_name in htlatex.sh htmex.sh ht.sh httexi.sh httex.sh htxelatex.sh htxetex.sh xhlatex.sh; do + newins texmf/scripts/tex4ht/"${script_name}" "${script_name%.*}" + done + + local DOC_CONTENTS="In order to avoid collisions with multiple packages, + we are not installing the scripts in /usr/bin any more. + If you want to use, say, htlatex, you can use 'mk4ht htlatex file'." + use java || DOC_CONTENTS+="\n\nODF converters (oolatex & friends) + require the java use flag." + readme.gentoo_create_doc +} + +pkg_postinst() { + latex-package_pkg_postinst + readme.gentoo_print_elog +}
