Received: by mail.netbsd.org (Postfix, from userid 605) id 701B884E64; Tue, 21 Jun 2022 22:14:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A9C0084E19 for ; Tue, 21 Jun 2022 22:14:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Ax-e_ohAPJ9p for ; Tue, 21 Jun 2022 22:14:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0130984D50 for ; Tue, 21 Jun 2022 22:14:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 38FFCFB1A; Tue, 21 Jun 2022 22:16:22 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1655849782219100" MIME-Version: 1.0 Date: Tue, 21 Jun 2022 22:16:22 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/print/tex-tabu To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20220621221622.38FFCFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1655849782219100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue Jun 21 22:16:22 UTC 2022 Modified Files: pkgsrc/print/tex-tabu: Makefile distinfo Added Files: pkgsrc/print/tex-tabu/patches: patch-tex_latex_tabu_tabu.sty Log Message: Merge work arounds for bad interactions between xcolor and tabu in newer LaTeX versions. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-tabu/Makefile \ pkgsrc/print/tex-tabu/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/print/tex-tabu/patches/patch-tex_latex_tabu_tabu.sty Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1655849782219100 Content-Disposition: inline Content-Length: 3690 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/tex-tabu/Makefile diff -u pkgsrc/print/tex-tabu/Makefile:1.6 pkgsrc/print/tex-tabu/Makefile:1.7 --- pkgsrc/print/tex-tabu/Makefile:1.6 Sat Jan 18 23:34:52 2020 +++ pkgsrc/print/tex-tabu/Makefile Tue Jun 21 22:16:21 2022 @@ -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 Index: pkgsrc/print/tex-tabu/distinfo diff -u pkgsrc/print/tex-tabu/distinfo:1.6 pkgsrc/print/tex-tabu/distinfo:1.7 --- pkgsrc/print/tex-tabu/distinfo:1.6 Tue Oct 26 11:14:45 2021 +++ pkgsrc/print/tex-tabu/distinfo Tue Jun 21 22:16:21 2022 @@ -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 Added files: Index: pkgsrc/print/tex-tabu/patches/patch-tex_latex_tabu_tabu.sty diff -u /dev/null pkgsrc/print/tex-tabu/patches/patch-tex_latex_tabu_tabu.sty:1.1 --- /dev/null Tue Jun 21 22:16:22 2022 +++ pkgsrc/print/tex-tabu/patches/patch-tex_latex_tabu_tabu.sty Tue Jun 21 22:16:22 2022 @@ -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 + %% + %% 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 --_----------=_1655849782219100--