[pkgsrc/trunk]: pkgsrc/print/tex-tabu Merge work arounds for bad interactions...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d23fd7021de
branches:  trunk
changeset: 380969:2d23fd7021de
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jun 21 22:16:21 2022 +0000

description:
Merge work arounds for bad interactions between xcolor and tabu in newer
LaTeX versions.

diffstat:

 print/tex-tabu/Makefile                              |   3 +-
 print/tex-tabu/distinfo                              |   3 +-
 print/tex-tabu/patches/patch-tex_latex_tabu_tabu.sty |  43 ++++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diffs (71 lines):

diff -r 455a29a22fb5 -r 2d23fd7021de print/tex-tabu/Makefile
--- a/print/tex-tabu/Makefile   Tue Jun 21 22:10:43 2022 +0000
+++ b/print/tex-tabu/Makefile   Tue Jun 21 22:16:21 2022 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2020/01/18 23:34:52 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2022/06/21 22:16:21 joerg Exp $
 
 DISTNAME=      tabu
 PKGNAME=       tex-${DISTNAME}-2.9
+PKGREVISION=   1
 TEXLIVE_REV=   49707
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r 455a29a22fb5 -r 2d23fd7021de print/tex-tabu/distinfo
--- a/print/tex-tabu/distinfo   Tue Jun 21 22:10:43 2022 +0000
+++ b/print/tex-tabu/distinfo   Tue Jun 21 22:16:21 2022 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:14:45 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/06/21 22:16:21 joerg Exp $
 
 BLAKE2s (tex-tabu-49707/tabu.tar.xz) = 9862730b6d37c307be80e7e52143cedf9e8068f51c2f731ca66d2363e85e23a5
 SHA512 (tex-tabu-49707/tabu.tar.xz) = bf557df30521d99abe4ce5c86e5487ff32f682ab7d94aecba88172012c7875942c977218317a4fc738f4edb119487bd6785f2348f771b8c98421c6494ba2eb5f
 Size (tex-tabu-49707/tabu.tar.xz) = 23900 bytes
+SHA1 (patch-tex_latex_tabu_tabu.sty) = 55f9e42caee8bfec8564da12e6f5c36896128a04
diff -r 455a29a22fb5 -r 2d23fd7021de print/tex-tabu/patches/patch-tex_latex_tabu_tabu.sty
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/tex-tabu/patches/patch-tex_latex_tabu_tabu.sty      Tue Jun 21 22:16:21 2022 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-tex_latex_tabu_tabu.sty,v 1.1 2022/06/21 22:16:22 joerg Exp $
+
+930bc77 from https://github.com/tabu-issues-for-future-maintainer/tabu/blob/main/tabu.sty
+
+--- tex/latex/tabu/tabu.sty.orig       2019-01-14 22:10:48.000000000 +0000
++++ tex/latex/tabu/tabu.sty
+@@ -52,12 +52,12 @@
+ %% lppl copyright 2010-2011 by FC <florent.chervet%free.fr@localhost>
+ %%
+ %% Updated 2019-01-11
+-%% Copyright 2019 tabu-fixed github group (LaTeX3 Project members)
+-%% Please report any issues at https://github.com/tabu-fixed/tabu
++%% Copyright 2019 tabu-issues-for-future-maintainer github group (LaTeX3 Project members)
++%% Please report any issues at https://github.com/tabu-issues-for-future-maintainer/tabu
+ %% 
+ 
+ \NeedsTeXFormat{LaTeX2e}
+-\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed)]
++\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-issues-for-future-maintainer) + intermediate FMi]
+ \RequirePackage{array}[2008/09/09]
+ \RequirePackage{varwidth}[2009/03/30]
+ \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined}
+@@ -727,6 +727,10 @@
+                       \tabu@currentgrouptype\expandafter{\the\currentgrouptype}}%
+ \fi
+ }% \tabu@init
++%%TABU-FIXED set up \tabu@currentgrouptype
++%FMi cancel for nested arrays ...
++\def\@tabarray{\m@th\def\tabu@currentgrouptype{\currentgrouptype}\@ifnextchar[\@array{\@array[c]}}
++
+ \def\tabu@indent{% correction for indentation
+     \ifdim \parindent>\z@\ifx \linewidth\tabudefaulttarget
+     \everypar\expandafter{%
+@@ -1663,6 +1667,9 @@
+         \ifdim \tabu@temp\p@>\z@ \ifdim \tabu@temp\tabucolX<\tabu@target
+                                         \tabu@target=\tabu@temp\tabucolX \fi\fi
+         \setbox\tabu@box  \hbox \bgroup
++%%TABU-FIXED add \color@begingroup
++%%FMi not yet understood why this one is also needed ...
++    \color@begingroup
+             \begin{varwidth}\tabu@target
+                 \let\FV@ListProcessLine \tabu@FV@ListProcessLine  % \hbox to natural width...
+                 \narrowragged \arraybackslash \parfillskip \@flushglue