commit: af3094c838edfaba66bafab2a7af83f1850748b5 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Thu Oct 2 18:19:45 2025 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Thu Oct 2 20:47:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af3094c8
dev-texlive/texlive-binextra: Fix longtable captions in make4ht Bug: https://puszcza.gnu.org.ua/bugs/?315 Bug: https://bugs.gentoo.org/963668 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> .../texlive-binextra-2024_p72338-make4ht.patch | 49 +++ .../texlive-binextra-2024_p72338-r2.ebuild | 333 +++++++++++++++++++++ 2 files changed, 382 insertions(+) diff --git a/dev-texlive/texlive-binextra/files/texlive-binextra-2024_p72338-make4ht.patch b/dev-texlive/texlive-binextra/files/texlive-binextra-2024_p72338-make4ht.patch new file mode 100644 index 000000000000..230a52ae4da0 --- /dev/null +++ b/dev-texlive/texlive-binextra/files/texlive-binextra-2024_p72338-make4ht.patch @@ -0,0 +1,49 @@ +Fix invalid html in longtable captions +https://puszcza.gnu.org.ua/bugs/?315 +https://bugs.gentoo.org/963668 + +commit 771081cac0d63632e67730e530eb8937271a68d9 +Author: Michal Hoftich <[email protected]> +Date: Wed Oct 1 14:56:02 2025 +0200 + + added tablecaption dom filter + +--- /dev/null ++++ b/texmf-dist/scripts/make4ht/domfilters/make4ht-tablecaption.lua +@@ -0,0 +1,25 @@ ++local function get_parent_table(caption) ++ -- recursively find the parent table of a caption element, as it can be inside <tr> and <td> ++ local parent = caption:get_parent() ++ if parent and parent:get_element_name() == "table" then ++ return parent ++ elseif parent then ++ return get_parent_table(parent) ++ else ++ return nil ++ end ++end ++ ++return function(dom) ++ -- the caption element must be a first element in table, it cannot be contained inside tr ++ for _, caption in ipairs(dom:query_selector("table caption")) do ++ local table = get_parent_table(caption) ++ if table then ++ -- insert caption as the first child of table ++ table:add_child_node(caption:copy_node(),1) ++ -- remove the original caption ++ caption:remove_node() ++ end ++ end ++ return dom ++end +--- a/texmf-dist/scripts/make4ht/extensions/make4ht-ext-common_domfilters.lua ++++ b/texmf-dist/scripts/make4ht/extensions/make4ht-ext-common_domfilters.lua +@@ -26,7 +26,7 @@ function M.modify_build(make) + make:match("4om$", process, {charclasses= charclasses}) + count = 2 + else +- local process = filter({"fixinlines", "idcolons", "joincharacters", "mathmlfixes", "tablerows","booktabs", "sectionid", "itemparagraphs"}, "commondomfilters") ++ local process = filter({"fixinlines", "idcolons", "joincharacters", "tablecaption", "mathmlfixes", "tablerows","booktabs", "sectionid", "itemparagraphs"}, "commondomfilters") + make:match("html?$", process) + count = 1 + end diff --git a/dev-texlive/texlive-binextra/texlive-binextra-2024_p72338-r2.ebuild b/dev-texlive/texlive-binextra/texlive-binextra-2024_p72338-r2.ebuild new file mode 100644 index 000000000000..e8203a0f4930 --- /dev/null +++ b/dev-texlive/texlive-binextra/texlive-binextra-2024_p72338-r2.ebuild @@ -0,0 +1,333 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TEXLIVE_MODULE_CONTENTS=" + collection-binextra.r72338 + a2ping.r52964 + adhocfilelist.r29349 + arara.r71205 + bundledoc.r64620 + checklistings.r38300 + chklref.r52649 + clojure-pamphlet.r67201 + cluttex.r68912 + ctan-o-mat.r51578 + ctanbib.r68650 + ctanify.r44129 + ctanupload.r26313 + ctie.r70015 + cweb.r72731 + de-macro.r66746 + digestif.r72163 + dtl.r62387 + dtxgen.r51663 + dviasm.r71902 + dvicopy.r70015 + dviinfox.r59216 + dviout-util.r66186 + easydtx.r68514 + findhyph.r47444 + fragmaster.r26313 + git-latexdiff.r54732 + installfont.r31205 + ketcindy.r58661 + l3sys-query.r70889 + latex-git-log.r71402 + latex-papersize.r53131 + latex2man.r64477 + latex2nemeth.r65269 + latexfileversion.r29349 + latexindent.r71840 + latexpand.r66226 + light-latex-make.r66473 + listings-ext.r29349 + ltxfileinfo.r38663 + ltximg.r59335 + make4ht.r72626 + match_parens.r66681 + mflua.r62774 + mkjobtexmf.r29725 + optexcount.r59817 + patgen.r70015 + pdfbook2.r53521 + pdfcrop.r66862 + pdflatexpicscale.r72650 + pdftex-quiet.r49169 + pdftosrc.r70015 + pdfxup.r71513 + pfarrei.r68950 + pkfix.r26032 + pkfix-helper.r56061 + ppmcheckpdf.r69527 + purifyeps.r29725 + pythontex.r59514 + runtexshebang.r68882 + seetexk.r57972 + spix.r65050 + sqltex.r72396 + srcredact.r38710 + sty2dtx.r64967 + synctex.r66203 + tex4ebook.r70112 + texaccents.r64447 + texblend.r68961 + texcount.r49013 + texdef.r64967 + texdiff.r29752 + texdirflatten.r55064 + texdoc.r70579 + texfot.r70969 + texliveonfly.r55777 + texloganalyser.r54526 + texlogfilter.r71525 + texlogsieve.r69436 + texosquery.r53676 + texplate.r71963 + texware.r70015 + tie.r70015 + tlcockpit.r54857 + typeoutfileinfo.r67526 + web.r70015 + xindex.r72605 + xpdfopen.r65952 +" +TEXLIVE_MODULE_DOC_CONTENTS=" + a2ping.doc.r52964 + adhocfilelist.doc.r29349 + arara.doc.r71205 + bundledoc.doc.r64620 + checklistings.doc.r38300 + chklref.doc.r52649 + clojure-pamphlet.doc.r67201 + cluttex.doc.r68912 + ctan-o-mat.doc.r51578 + ctan_chk.doc.r36304 + ctanbib.doc.r68650 + ctanify.doc.r44129 + ctanupload.doc.r26313 + ctie.doc.r70015 + cweb.doc.r72731 + de-macro.doc.r66746 + digestif.doc.r72163 + dtl.doc.r62387 + dtxgen.doc.r51663 + dviasm.doc.r71902 + dvicopy.doc.r70015 + dviinfox.doc.r59216 + dviout-util.doc.r66186 + easydtx.doc.r68514 + findhyph.doc.r47444 + fragmaster.doc.r26313 + git-latexdiff.doc.r54732 + hook-pre-commit-pkg.doc.r41378 + installfont.doc.r31205 + ketcindy.doc.r58661 + l3sys-query.doc.r70889 + latex-git-log.doc.r71402 + latex-papersize.doc.r53131 + latex2man.doc.r64477 + latex2nemeth.doc.r65269 + latexfileversion.doc.r29349 + latexindent.doc.r71840 + latexpand.doc.r66226 + light-latex-make.doc.r66473 + listings-ext.doc.r29349 + ltxfileinfo.doc.r38663 + ltximg.doc.r59335 + make4ht.doc.r72626 + match_parens.doc.r66681 + mkjobtexmf.doc.r29725 + optexcount.doc.r59817 + patgen.doc.r70015 + pdfbook2.doc.r53521 + pdfcrop.doc.r66862 + pdflatexpicscale.doc.r72650 + pdftex-quiet.doc.r49169 + pdftosrc.doc.r70015 + pdfxup.doc.r71513 + pfarrei.doc.r68950 + pkfix.doc.r26032 + pkfix-helper.doc.r56061 + ppmcheckpdf.doc.r69527 + purifyeps.doc.r29725 + pythontex.doc.r59514 + runtexshebang.doc.r68882 + seetexk.doc.r57972 + spix.doc.r65050 + sqltex.doc.r72396 + srcredact.doc.r38710 + sty2dtx.doc.r64967 + synctex.doc.r66203 + tex4ebook.doc.r70112 + texaccents.doc.r64447 + texblend.doc.r68961 + texcount.doc.r49013 + texdef.doc.r64967 + texdiff.doc.r29752 + texdirflatten.doc.r55064 + texdoc.doc.r70579 + texfot.doc.r70969 + texliveonfly.doc.r55777 + texloganalyser.doc.r54526 + texlogfilter.doc.r71525 + texlogsieve.doc.r69436 + texosquery.doc.r53676 + texplate.doc.r71963 + texware.doc.r70015 + tie.doc.r70015 + tlcockpit.doc.r54857 + typeoutfileinfo.doc.r67526 + web.doc.r70015 + xindex.doc.r72605 + xpdfopen.doc.r65952 +" +TEXLIVE_MODULE_SRC_CONTENTS=" + adhocfilelist.source.r29349 + arara.source.r71205 + checklistings.source.r38300 + clojure-pamphlet.source.r67201 + listings-ext.source.r29349 + mkjobtexmf.source.r29725 + optexcount.source.r59817 + pfarrei.source.r68950 + pythontex.source.r59514 + sqltex.source.r72396 + texaccents.source.r64447 + texdef.source.r64967 + texosquery.source.r53676 + texplate.source.r71963 + tlcockpit.source.r54857 +" + +inherit shell-completion texlive-module + +DESCRIPTION="TeXLive TeX auxiliary programs" + +LICENSE="Apache-2.0 Artistic BSD BSD-2 FDL-1.1+ GPL-1+ GPL-2 GPL-3 GPL-3+ LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +COMMON_DEPEND=" + >=dev-texlive/texlive-basic-2024 +" +RDEPEND=" + ${COMMON_DEPEND} + >=app-text/dvisvgm-3.2.2 + >=app-text/pdfjam-3.12 + >=dev-tex/bibtexu-3.72 + >=dev-tex/latexdiff-1.3.4 + >=dev-tex/latexmk-4.85 +" +DEPEND=" + ${COMMON_DEPEND} +" +# app-text/texlive-core for texlua/luatex to generate the shellc completion +BDEPEND=" + app-text/texlive-core +" + +PATCHES=( "${FILESDIR}/${P}-make4ht.patch" ) + +TEXLIVE_MODULE_BINSCRIPTS=" + texmf-dist/scripts/a2ping/a2ping.pl + texmf-dist/scripts/adhocfilelist/adhocfilelist.sh + texmf-dist/scripts/arara/arara.sh + texmf-dist/scripts/bundledoc/arlatex + texmf-dist/scripts/bundledoc/bundledoc + texmf-dist/scripts/checklistings/checklistings.sh + texmf-dist/scripts/chklref/chklref.pl + texmf-dist/scripts/clojure-pamphlet/pamphletangler + texmf-dist/scripts/cluttex/cluttex.lua + texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl + texmf-dist/scripts/ctanbib/ctanbib + texmf-dist/scripts/ctanify/ctanify + texmf-dist/scripts/ctanupload/ctanupload.pl + texmf-dist/scripts/de-macro/de-macro + texmf-dist/scripts/digestif/digestif.texlua + texmf-dist/scripts/dtxgen/dtxgen + texmf-dist/scripts/dviasm/dviasm.py + texmf-dist/scripts/dviinfox/dviinfox.pl + texmf-dist/scripts/easydtx/edtx2dtx.pl + texmf-dist/scripts/findhyph/findhyph + texmf-dist/scripts/fragmaster/fragmaster.pl + texmf-dist/scripts/git-latexdiff/git-latexdiff + texmf-dist/scripts/installfont/installfont-tl + texmf-dist/scripts/ketcindy/ketcindy.pl + texmf-dist/scripts/l3sys-query/l3sys-query.lua + texmf-dist/scripts/latex-git-log/latex-git-log + texmf-dist/scripts/latex-papersize/latex-papersize.py + texmf-dist/scripts/latex2man/latex2man + texmf-dist/scripts/latex2nemeth/latex2nemeth + texmf-dist/scripts/latexfileversion/latexfileversion + texmf-dist/scripts/latexindent/latexindent.pl + texmf-dist/scripts/latexpand/latexpand + texmf-dist/scripts/light-latex-make/llmk.lua + texmf-dist/scripts/listings-ext/listings-ext.sh + texmf-dist/scripts/ltxfileinfo/ltxfileinfo + texmf-dist/scripts/ltximg/ltximg.pl + texmf-dist/scripts/make4ht/make4ht + texmf-dist/scripts/match_parens/match_parens + texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl + texmf-dist/scripts/optexcount/optexcount + texmf-dist/scripts/pdfbook2/pdfbook2 + texmf-dist/scripts/pdfcrop/pdfcrop.pl + texmf-dist/scripts/pdflatexpicscale/pdflatexpicscale.pl + texmf-dist/scripts/pdftex-quiet/pdftex-quiet + texmf-dist/scripts/pdfxup/pdfxup + texmf-dist/scripts/pfarrei/a5toa4.tlu + texmf-dist/scripts/pfarrei/pfarrei.tlu + texmf-dist/scripts/pkfix/pkfix.pl + texmf-dist/scripts/pkfix-helper/pkfix-helper + texmf-dist/scripts/purifyeps/purifyeps + texmf-dist/scripts/pythontex/depythontex.py + texmf-dist/scripts/pythontex/pythontex.py + texmf-dist/scripts/runtexshebang/runtexshebang.lua + texmf-dist/scripts/spix/spix.py + texmf-dist/scripts/sqltex/sqltex + texmf-dist/scripts/srcredact/srcredact.pl + texmf-dist/scripts/sty2dtx/sty2dtx.pl + texmf-dist/scripts/tex4ebook/tex4ebook + texmf-dist/scripts/texaccents/texaccents.sno + texmf-dist/scripts/texblend/texblend + texmf-dist/scripts/texcount/texcount.pl + texmf-dist/scripts/texdef/texdef.pl + texmf-dist/scripts/texdiff/texdiff + texmf-dist/scripts/texdirflatten/texdirflatten + texmf-dist/scripts/texdoc/texdoc.tlu + texmf-dist/scripts/texfot/texfot.pl + texmf-dist/scripts/texliveonfly/texliveonfly.py + texmf-dist/scripts/texloganalyser/texloganalyser + texmf-dist/scripts/texlogfilter/texlogfilter + texmf-dist/scripts/texlogsieve/texlogsieve + texmf-dist/scripts/texosquery/texosquery-jre5.sh + texmf-dist/scripts/texosquery/texosquery-jre8.sh + texmf-dist/scripts/texosquery/texosquery.sh + texmf-dist/scripts/texplate/texplate.sh + texmf-dist/scripts/tlcockpit/tlcockpit.sh + texmf-dist/scripts/typeoutfileinfo/typeoutfileinfo.sh + texmf-dist/scripts/xindex/xindex.lua +" +TEXLIVE_SCRIPTS_W_FILE_EXT=" + listings-ext.sh +" + +TEXLIVE_MODULE_BINLINKS=" + cluttex:clxelatex + cluttex:cllualatex + pdfcrop:rpdfcrop + texdef:latexdef +" + +src_compile() { + texlive-module_src_compile + ./texmf-dist/scripts/texdoc/texdoc.tlu \ + --print-completion zsh \ + > "${T}"/_texdoc || die +} + +src_install() { + texlive-module_src_install + keepdir /var/lib/texmf/web2c + dozshcomp "${T}"/_texdoc +}
