From af7cbe0e07505a3c93324c6008f280474dd8396f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Jan 2019 22:10:48 +0000 Subject: tabu (14jan19) git-svn-id: svn://tug.org/texlive/trunk@49707 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tabu/README | 42 ------- Master/texmf-dist/doc/latex/tabu/README.md | 84 +++++++++++++ Master/texmf-dist/doc/latex/tabu/tabu.pdf | Bin 2464778 -> 2526818 bytes Master/texmf-dist/source/latex/tabu/tabu.drv | 179 --------------------------- Master/texmf-dist/source/latex/tabu/tabu.ins | 168 ------------------------- Master/texmf-dist/tex/latex/tabu/tabu.sty | 97 +++++++++++---- Master/tlpkg/libexec/ctan2tds | 1 + 7 files changed, 156 insertions(+), 415 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/tabu/README create mode 100644 Master/texmf-dist/doc/latex/tabu/README.md delete mode 100644 Master/texmf-dist/source/latex/tabu/tabu.drv delete mode 100644 Master/texmf-dist/source/latex/tabu/tabu.ins diff --git a/Master/texmf-dist/doc/latex/tabu/README b/Master/texmf-dist/doc/latex/tabu/README deleted file mode 100644 index 295162e2b84..00000000000 --- a/Master/texmf-dist/doc/latex/tabu/README +++ /dev/null @@ -1,42 +0,0 @@ -+---------------------------------------------------------+ -| tabu - Flexible LaTeX tabulars | -+---------------------------------------------------------+ - -tabu provides a single environment: tabu -designed to make all kind of tabulars provided that they do -not split accross pages. - -tabu is based on array.sty and requires no other package. -tabu does not modify array.sty nor the classes of tokens. - -Starting from version 1.5, longtabu is provided: based on -longtable, longtabu allows tabulars to stretch out on -several pages. - -tabu can be used in place of tabular, tabular* and tabularx -X columns in tabu can be specified with a width coefficient -the alignement (l,r,c,j) the column type (p,m,b) or even $. - -tabu also works in math mode and its name remains tabu. -tabu can contain any type of tabular, array, tabularx -tabu can be put inside tabular, array, tabularx, tabular* - -\begin{tabu} is like tabular if the preamble has no X column -\begin{tabu} to specifies the target width -\begin{tabu} spread enlarge the natural width - -tabu with X columns has a default target if not specified -(usefull for nested tabus + compatibility with \linegoal) - -tabu provides facilities to change the font and the alignment -in one row (\rowfont), save and restore the preamble and the -tabular parameters (\savetabu, \usetabu, \preamble). - -tabu provides other facilities to align numbers in X columns -draw lines with color, dashed or even leaders. Those facilities -are provided for convenience: they work as long as the tabu -preamble does not contain "too special tokens". - -tabu has been tested successfully with many packages related -to tabulars, cells, alignment... - diff --git a/Master/texmf-dist/doc/latex/tabu/README.md b/Master/texmf-dist/doc/latex/tabu/README.md new file mode 100644 index 00000000000..61a3eb8eeb4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tabu/README.md @@ -0,0 +1,84 @@ +# tabu + + +## Original Tabu README + + +## tabu - Flexible LaTeX tabulars + + +tabu provides a single environment: tabu +designed to make all kind of tabulars provided that they do +not split accross pages. + +tabu is based on array.sty and requires no other package. +tabu does not modify array.sty nor the classes of tokens. + +Starting from version 1.5, longtabu is provided: based on +longtable, longtabu allows tabulars to stretch out on +several pages. + +tabu can be used in place of tabular, tabular* and tabularx +X columns in tabu can be specified with a width coefficient +the alignement (l,r,c,j) the column type (p,m,b) or even $. + +tabu also works in math mode and its name remains tabu. +tabu can contain any type of tabular, array, tabularx +tabu can be put inside tabular, array, tabularx, tabular* + +\begin{tabu} is like tabular if the preamble has no X column +\begin{tabu} to specifies the target width +\begin{tabu} spread enlarge the natural width + +tabu with X columns has a default target if not specified +(usefull for nested tabus + compatibility with \linegoal) + +tabu provides facilities to change the font and the alignment +in one row (\rowfont), save and restore the preamble and the +tabular parameters (\savetabu, \usetabu, \preamble). + +tabu provides other facilities to align numbers in X columns +draw lines with color, dashed or even leaders. Those facilities +are provided for convenience: they work as long as the tabu +preamble does not contain "too special tokens". + +tabu has been tested successfully with many packages related +to tabulars, cells, alignment... + +- - - - + +## Emergency updates to the LaTeX tabu package + +The original author of tabu appears out of contact, and tabu had not +been updated for several years, finally becoming unusable in 2019 as +updates to other packages mean some of its patched code did not work +as intended. + +The package is not being actively maintained however any major required +fixes may be reported to the https://github.com/tabu-fixed/tabu repository +and volunteers there (currently members of the LaTeX3 Team) will attempt +to update the package with any fixes required. + + + + +## Issues from Stackexchange + +### Fixed in release 2.9 + +https://tex.stackexchange.com/questions/469282/xcolor-breaking-and-align-environments-inside-tabu + +https://tex.stackexchange.com/questions/468948/longtabu-and-color-compatibility + +https://tex.stackexchange.com/questions/466147/tabu-very-recently-stopped-working-with-color-xcolor-or-with-fancyvrb/466261 + +https://tex.stackexchange.com/questions/87144/incompatibility-between-verbatim-and-tabu-danger-of-using-scantokens-in-a-pac + +https://tex.stackexchange.com/questions/430973/tabu-m-column-vertical-alignment-not-working-after-package-updates +(Note that this is only a temporary fix reverting the change in array package m column implementation. +A more complete fix would be to adapt tabu code to the new array.) + + +### Not yet handled + +https://tex.stackexchange.com/questions/201510/what-is-the-difference-between-and-linebreak-in-cfoot \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tabu/tabu.pdf b/Master/texmf-dist/doc/latex/tabu/tabu.pdf index 9d2ef8a260b..b61fb84ed77 100644 Binary files a/Master/texmf-dist/doc/latex/tabu/tabu.pdf and b/Master/texmf-dist/doc/latex/tabu/tabu.pdf differ diff --git a/Master/texmf-dist/source/latex/tabu/tabu.drv b/Master/texmf-dist/source/latex/tabu/tabu.drv deleted file mode 100644 index 46dd5ef5499..00000000000 --- a/Master/texmf-dist/source/latex/tabu/tabu.drv +++ /dev/null @@ -1,179 +0,0 @@ -%% -%% This is file `tabu.drv', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% tabu.dtx (with options: `driver') -%% -%% This is a generated file. -%% Copyright (FC) 2010-2011 - lppl -%% -%% tabu : 2011/02/26 v2.8 - tabu : Flexible LaTeX tabulars -%% -%% ********************************************************************************************** -%% \begin{tabu} { preamble } => default target: \linewidth or \linegoal -%% \begin{tabu} to { preamble } => target specified -%% \begin{tabu} spread { preamble } => target relative to the ``natural width'' -%% -%% tabu works in text and in math modes. -%% -%% X columns: automatic width ajustment + horizontal and vertical alignment -%% \begin{tabu} { X[4c] X[1c] X[-2ml] } -%% -%% Horizontal lines and / or leaders: -%% \hline\hline => double horizontal line -%% \firsthline\hline => for nested tabulars -%% \lasthline\hline => for nested tabulars -%% \tabucline[line spec]{column-column} => ``funny'' lines (dash/leader) -%% Automatic lines / leaders : -%% \everyrow{\hline\hline} -%% -%% Vertical lines and / or leaders: -%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] } -%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt on 2pt off 4pt blue] } -%% -%% Fixed vertical spacing adjustment: -%% \extrarowheight= \extrarowdepth= -%% or: \extrarowsep= => may be prefixed by \global -%% -%% Dynamic vertical spacing adjustment: -%% \abovetabulinesep= \belowtabulinesep= -%% or: \tabulinesep= => may be prefixed by \global -%% -%% delarray.sty shortcuts: in math and text modes -%% \begin{tabu} .... \({ preamble }\) -%% -%% Algorithms reports: -%% \tracingtabu=1 \tracingtabu=2 -%% -%% ********************************************************************************************** -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3 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 -%% -%% This work consists of the main source file tabu.dtx -%% and the derived files -%% tabu.sty, tabu.pdf, tabu.ins -%% -%% tabu : Flexible LaTeX tabulars -%% lppl copyright 2010-2011 by FC -%% -\let\microtypeYN=y -\edef\thisfile{\jobname} -\def\thisinfo{Flexible \LaTeX{} tabulars (\FC)} -\def\thisdate{2011/02/26} -\def\thisversion{2.8} -\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex} -\def\CTANdisplay{CTAN:macros/latex} -\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother -\newcommand*\CTANhrefstar[3][/contrib/]{\href{\CTANbaseurl#1#2}{#3}} -\newcommand*\CTANhrefnost[2][/contrib/]{\href{\CTANbaseurl#1#2}{\nolinkurl{\CTANdisplay#1#2}}} -\let\loadclass\LoadClass -\def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}} -{\makeatletter{\endlinechar`\^^J\obeyspaces - \gdef\ErrorUpdate#1=#2,{\@ifpackagelater{#1}{#2}{}{\let\CheckDate\errmessage\toks@\expandafter{\the\toks@ - \thisfile-documentation: updates required ! - package #1 must be later than #2 - to compile this documentation.}}}}% - \gdef\CheckDate#1{{\let\CheckDate\relax\toks@{}\@for\x:=\thisfile=\thisdate,#1\do{\expandafter\ErrorUpdate\x,}\CheckDate\expandafter{\the\toks@}}}} -\AtBeginDocument{\CheckDate{interfaces=2011/02/12,linegoal=2011/02/25}} -\PassOptionsToPackage{svgnames,table}{xcolor} -\PassOptionsToPackage{hyperfootnotes}{hyperref} -\documentclass[a4paper,oneside]{ltxdoc} -\AtBeginDocument{\tracingnesting=1 \DeleteShortVerb{\|}\catcode164=14} -\usepackage[latin1]{inputenc} -\usepackage[T1]{fontenc} -\usepackage{ltxnew,etoolbox,geometry,graphicx,xcolor,needspace,ragged2e} % general tools -\usepackage{lmodern,bbding,hologo,relsize,moresize,manfnt,pifont,upgreek} % fonts -\usepackage[official]{eurosym} % font -\ifx y\microtypeYN % - \usepackage[expansion=all,stretch=20,shrink=60]{microtype}\fi % font (microtype) -\usepackage{xspace,tocloft,titlesec,fancyhdr,lastpage,enumitem,marginnote} % paragraphs & pages management -\usepackage{holtxdoc,bookmark,hypbmsec,enumitem-zref} % hyper-links -\usepackage{array,delarray,longtable,colortbl,multirow,makecell,booktabs} % tabulars -\usepackage{tabularx}\tracingtabularx % tabularx -\usepackage{amsmath,amsopn} % mathematics \DeclareMathOperator in amsopn -\usepackage[a]{esvect} % mathematics : for nice vectors arrows -\usepackage{numprint,xfrac,siunitx} % numbers / units / fractions -\usepackage{embedfile} % .dtx enclosed in .pdf -\usepackage{fancyvrb}\fvset{gobble=0,listparameters={\topsep=0pt}} % verbatim -\usepackage{interfaces} % interfaces (à tester aussi avant \documentclass) -\usetikz{basic,chains,positioning} % pgf / TikZ -\usepackage{nccfoots} % \Footnote{marker}{text} -\usepackage{embedfile} -\RequirePackage{amsopn,amsmath}% -\RequirePackage[a]{esvect}% for vectors -\DeclareMathOperator*\Div{div} -\DeclareMathOperator*\Rot{\vv{\text{rot}}} -\DeclareMathOperator*\Min{Min} -\DeclareMathOperator*\Max{Max} -\newrobustcmd*\dpartial[2]{\displaystyle\genfrac{}{}{}{}{\partial\mkern.2\thinmuskip#1}{\partial\mkern.2\thinmuskip#2}} -\newrobustcmd*\dtotal[2]{\displaystyle\genfrac{}{}{}{}{\text d\mkern.2\thinmuskip#1}{\text d\mkern.2\thinmuskip#2}} -\newrobustcmd*\abs[1]{\left\lvert#1\right\rvert} -\usepackage{expl3,l3keys2e,siunitx} -\usepackage{xfrac} -\usepackage{listings} -\lstset{ - gobble=1, - language=[LaTeX]TeX, - basicstyle=\ttfamily, - breaklines=true, - upquote=true, - backgroundcolor=\color[gray]{0.90}, - keywordstyle=\color{blue}\bfseries, - keywordstyle=[2]{\color{ForestGreen}}, - commentstyle=\ttfamily\color{violet}, - keywordstyle=[3]{\color{black}\bfseries}, - keywordstyle=[4]{\color{red}\bfseries}, - keywordstyle=[5]{\color{blue}\bfseries}, - keywordstyle=[6]{\color{green}\bfseries}, - keywordstyle=[7]{\color{yellow}\bfseries}, - %extendedchars={true}, - alsoletter={&}, -morekeywords=[1]{ - \lstdefinestyle, - \lstinputlisting,\lstset, - \color, - \geometry,\lasthline,\firsthline, - \cmidrule,\toprule,\bottomrule, - \everyrow,\tabulinestyle,\tabureset,\savetabu,\usetabu,\preamble, - \taburulecolor,\taburowcolors}, -morekeywords=[2]{ - tabular, - caption, - table, - tabu}, -morekeywords=[3]{ - &}, -morekeywords=[4]{red}, -morekeywords=[5]{blue}, -morekeywords=[6]{green}, -morekeywords=[7]{yellow}, -} -\csname endofdump\endcsname -\CodelineNumbered -\usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}} -\usepackage[linegoal]{tabu}\tracingtabu=2 -\newtabulinestyle{dash=on1pt off1pt} -\lastlinefit999 -\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm} -\hypersetup{% - pdftitle={tabu}, - pdfsubject={a simple line parser for TeX}, - pdfauthor={Florent CHERVET}, - colorlinks,linkcolor=reflink,urlcolor=refurl, - pdfstartview=FitH,pdfpagemode=UseOutlines, - pdfkeywords={tex, e-tex, latex, package, tabular, array, halign, tabularx, longtable, color, colortbl, alignment}, - } -\embedfile{\thisfile.dtx} -\begin{document} - \DocInput{\thisfile.dtx} -\end{document} - -\endinput -%% -%% End of file `tabu.drv'. diff --git a/Master/texmf-dist/source/latex/tabu/tabu.ins b/Master/texmf-dist/source/latex/tabu/tabu.ins deleted file mode 100644 index ff03c1e9c4b..00000000000 --- a/Master/texmf-dist/source/latex/tabu/tabu.ins +++ /dev/null @@ -1,168 +0,0 @@ -%% -%% This is file `tabu.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% tabu.dtx (with options: `install') -%% -%% This is a generated file. -%% Copyright (FC) 2010-2011 - lppl -%% -%% tabu : 2011/02/26 v2.8 - tabu : Flexible LaTeX tabulars -%% -%% ********************************************************************************************** -%% \begin{tabu} { preamble } => default target: \linewidth or \linegoal -%% \begin{tabu} to { preamble } => target specified -%% \begin{tabu} spread { preamble } => target relative to the ``natural width'' -%% -%% tabu works in text and in math modes. -%% -%% X columns: automatic width ajustment + horizontal and vertical alignment -%% \begin{tabu} { X[4c] X[1c] X[-2ml] } -%% -%% Horizontal lines and / or leaders: -%% \hline\hline => double horizontal line -%% \firsthline\hline => for nested tabulars -%% \lasthline\hline => for nested tabulars -%% \tabucline[line spec]{column-column} => ``funny'' lines (dash/leader) -%% Automatic lines / leaders : -%% \everyrow{\hline\hline} -%% -%% Vertical lines and / or leaders: -%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] } -%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt on 2pt off 4pt blue] } -%% -%% Fixed vertical spacing adjustment: -%% \extrarowheight= \extrarowdepth= -%% or: \extrarowsep= => may be prefixed by \global -%% -%% Dynamic vertical spacing adjustment: -%% \abovetabulinesep= \belowtabulinesep= -%% or: \tabulinesep= => may be prefixed by \global -%% -%% delarray.sty shortcuts: in math and text modes -%% \begin{tabu} .... \({ preamble }\) -%% -%% Algorithms reports: -%% \tracingtabu=1 \tracingtabu=2 -%% -%% ********************************************************************************************** -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3 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 -%% -%% This work consists of the main source file tabu.dtx -%% and the derived files -%% tabu.sty, tabu.pdf, tabu.ins -%% -%% tabu : Flexible LaTeX tabulars -%% lppl copyright 2010-2011 by FC -%% -\input docstrip.tex -\Msg{************************************************************************} -\Msg{* Installation} -\Msg{* Package: 2011/02/26 v2.8 - tabu: Flexible LaTeX tabulars} -\Msg{************************************************************************} - -\keepsilent -\askforoverwritefalse - -\let\MetaPrefix \relax -\preamble - -This is a generated file. -Copyright (FC) 2010-2011 - lppl - -tabu : 2011/02/26 v2.8 - tabu : Flexible LaTeX tabulars - -********************************************************************************************** -\string\begin{tabu} { preamble } => default target: \string\linewidth or \string\linegoal -\string\begin{tabu} to { preamble } => target specified -\string\begin{tabu} spread { preamble } => target relative to the ``natural width'' - - tabu works in text and in math modes. - - X columns: automatic width ajustment + horizontal and vertical alignment - \string\begin{tabu} { X[4c] X[1c] X[-2ml] } - - Horizontal lines and / or leaders: - \string\hline\string\hline => double horizontal line - \string\firsthline\string\hline => for nested tabulars - \string\lasthline\string\hline => for nested tabulars - \string\tabucline[line spec]{column-column} => ``funny'' lines (dash/leader) - Automatic lines / leaders : - \string\everyrow{\string\hline\string\hline} - - Vertical lines and / or leaders: - \string\begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] } - \string\begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt on 2pt off 4pt blue] } - - Fixed vertical spacing adjustment: - \string\extrarowheight= \string\extrarowdepth= - or: \string\extrarowsep= => may be prefixed by \string\global - - Dynamic vertical spacing adjustment: - \string\abovetabulinesep= \string\belowtabulinesep= - or: \string\tabulinesep= => may be prefixed by \string\global - - delarray.sty shortcuts: in math and text modes - \string\begin{tabu} .... \string\({ preamble }\string\) - - Algorithms reports: - \string\tracingtabu=1 \string\tracingtabu=2 - -********************************************************************************************** - -This work may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either -version 1.3 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 - -This work consists of the main source file tabu.dtx -and the derived files - tabu.sty, tabu.pdf, tabu.ins - -tabu : Flexible LaTeX tabulars -lppl copyright 2010-2011 by FC - -\endpreamble -\let\MetaPrefix \DoubleperCent - -{ -\catcode164=9 -\generate{% - \file{tabu.ins}{\from{tabu.dtx}{install}}% - \file{tabu.sty}{\from{tabu.dtx}{package}}% -} -} - -\askforoverwritefalse -\generate{% - \file{tabu.drv}{\from{tabu.dtx}{driver}}% -} - -\obeyspaces -\Msg{************************************************************************} -\Msg{*} -\Msg{* To finish the installation you have to move the following} -\Msg{* file into a directory searched by TeX:} -\Msg{*} -\Msg{* tabu.sty} -\Msg{*} -\Msg{* To produce the documentation run the file `tabu.dtx'} -\Msg{* through LaTeX.} -\Msg{*} -\Msg{* Happy TeXing!} -\Msg{*} -\Msg{************************************************************************} - -\endbatchfile - -\endinput -%% -%% End of file `tabu.ins'. diff --git a/Master/texmf-dist/tex/latex/tabu/tabu.sty b/Master/texmf-dist/tex/latex/tabu/tabu.sty index 3c18755daf2..e62cacff5fc 100644 --- a/Master/texmf-dist/tex/latex/tabu/tabu.sty +++ b/Master/texmf-dist/tex/latex/tabu/tabu.sty @@ -1,15 +1,6 @@ +%%TABU-FIXED %% -%% This is file `tabu.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% tabu.dtx (with options: `package') -%% -%% This is a generated file. -%% Copyright (FC) 2010-2011 - lppl -%% -%% tabu : 2011/02/26 v2.8 - tabu : Flexible LaTeX tabulars +%% tabu : 2019-01-11 - tabu : Flexible LaTeX tabulars %% %% ********************************************************************************************** %% \begin{tabu} { preamble } => default target: \linewidth or \linegoal @@ -55,16 +46,18 @@ %% version. The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% -%% This work consists of the main source file tabu.dtx -%% and the derived files -%% tabu.sty, tabu.pdf, tabu.ins -%% +%% +%%TABU-FIXED %% tabu : Flexible LaTeX tabulars %% 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 %% -\NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{tabu}[2011/02/26 v2.8 - flexible LaTeX tabulars (FC)] +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed)] \RequirePackage{array}[2008/09/09] \RequirePackage{varwidth}[2009/03/30] \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined} @@ -163,8 +156,18 @@ \edef#2{#1}\tabu@strtrim#2\@onelevel@sanitize#2% \expandafter}\expandafter\def\expandafter#2\expandafter{#2}% }% \tabu@sanitizearg -\def\tabu@textbar #1{\begingroup \endlinechar\m@ne \scantokens{\def\:{|}}% - \expandafter\endgroup \expandafter#1\:% !!! semi simple group !!! + +%%TABU-FIXED +\def\tabu@textbar#1{% + \begingroup + \newlinechar \m@ne% + \endlinechar \m@ne + \everyeof{\noexpand}% + \edef\:{\expandafter\noexpand\scantokens{|}}% + \expandafter + \endgroup + \expandafter #1% + \:% }% \tabu@textbar \def\tabu@everyrow@bgroup{\iftabu@everyrow \begingroup \else \noalign{\ifnum0=`}\fi \fi} \def\tabu@everyrow@egroup{% @@ -715,6 +718,14 @@ \let\tabu@tabarray \@tabarray % idem " " " " " " " \tabu@adl@fix \let\endarray \tabu@endarray % colortbl & arydshln (delarray) \iftabu@colortbl\CT@everycr\expandafter{\expandafter\iftabu@everyrow \the\CT@everycr \fi}\fi +%%TABU-FIXED set up old version of array package \@classz to avoid recoding m (and X) here. (Partial fix only: may not cover all cases) + \let\tabu@classzORI\@classz \let\@classz \tabu@classz +%%TABU-FIXED set up \tabu@currentgrouptype +\def\tabu@currentgrouptype{\currentgrouptype}% +\ifx\color@begingroup\begingroup +\def\color@begingroup{\expandafter\begingroup\expandafter\def\expandafter + \tabu@currentgrouptype\expandafter{\the\currentgrouptype}}% +\fi }% \tabu@init \def\tabu@indent{% correction for indentation \ifdim \parindent>\z@\ifx \linewidth\tabudefaulttarget @@ -840,6 +851,30 @@ }% \tabu@reset \def\tabu@setsave #1{\expandafter\tabu@sets@ve #1\@nil{#1}} \long\def\tabu@sets@ve #1\@nil #2{\@temptokena\expandafter{\the\@temptokena \def#2{#1}}} +%%TABU-FIXED define classz to use vcenter, reverting a change in array package +\let\tabu@classzORI\@classz +\def\tabu@classz{% +\ifx\tabu@prepnext@tok\prepnext@tok% in tabu +\expandafter\tabu@classz@oldarray +\else +\tabu@classzORI +\fi}% +\def\tabu@classz@oldarray{% + \@classx + \@tempcnta \count@ + \prepnext@tok + \@addtopreamble{\ifcase \@chnum + \hfil + \d@llarbegin + \insert@column + \d@llarend \hfil \or + \hskip1sp\d@llarbegin \insert@column \d@llarend \hfil \or + \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \or + $\vcenter + \@startpbox{\@nextchar}\insert@column \@endpbox $\or + \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or + \vbox \@startpbox{\@nextchar}\insert@column \@endpbox + \fi}\prepnext@tok}% %% The Rewritting Process ------------------------------------------- \def\tabu@newcolumntype #1{% \expandafter\tabu@new@columntype @@ -1632,7 +1667,10 @@ \let\FV@ListProcessLine \tabu@FV@ListProcessLine % \hbox to natural width... \narrowragged \arraybackslash \parfillskip \@flushglue \ifdefined\pdfadjustspacing \pdfadjustspacing\z@ \fi - \bgroup \aftergroup\tabu@endpboxmeasure + \bgroup + \aftergroup\tabu@endpboxmeasure +%%TABU-FIXED add \color@begingroup + \color@begingroup \ifdefined \cellspacetoplimit \tabu@cellspacepatch \fi \else \expandafter\@gobble \tabu@startpboxquick{#1}% \@gobble \bgroup @@ -1642,7 +1680,10 @@ \bgroup\color@begingroup} \def\tabu@endpboxmeasure {% \@finalstrut \@arstrutbox - \end{varwidth}\egroup % + \end{varwidth}% +%TABU-FIXED add \color@begingroup +\color@endgroup +\egroup % \ifdim \tabu@temp\p@ <\z@ % neg coef \ifdim \tabu@wd\tabu@Xcol <\wd\tabu@box \tabu@wddef\tabu@Xcol {\the\wd\tabu@box}% @@ -1686,14 +1727,15 @@ \def\tabu@endtabu {\end{tabu}} \def\tabu@endtabus {\end{tabu*}} %% Measuring the heights and depths - store the results ------------- +%%TABU-FIXED use \tabu@currentgrouptype \def\tabu@verticalmeasure{\everypar{}% - \ifnum \currentgrouptype>12 % 14=semi-simple, 15=math shift group + \ifnum \tabu@currentgrouptype>12 % 14=semi-simple, 15=math shift group \setbox\tabu@box =\hbox\bgroup \let\tabu@verticalspacing \tabu@verticalsp@lcr \d@llarbegin % after \hbox ... \else - \edef\tabu@temp{\ifnum\currentgrouptype=5\vtop - \else\ifnum\currentgrouptype=12\vcenter + \edef\tabu@temp{\ifnum\tabu@currentgrouptype=5\vtop + \else\ifnum\tabu@currentgrouptype=12\vcenter \else\vbox\fi\fi}% \setbox\tabu@box \hbox\bgroup$\tabu@temp \bgroup \let\tabu@verticalspacing \tabu@verticalsp@pmb @@ -2409,7 +2451,9 @@ }% \tabu@adl@xarraydashrule \def\tabu@adl@act@endpbox {% \unskip \ifhmode \nobreak \fi \@finalstrut \@arstrutbox - \egroup \egroup +%%TABU-FIXED +\color@endgroup + \egroup \egroup \adl@colhtdp \box\adl@box \hfil }% \tabu@adl@act@endpbox \def\tabu@adl@fix {% @@ -2421,7 +2465,8 @@ %% Correction for longtable' \@startbox definition ------------------ %% => \everypar is ``missing'' : TeX should be in vertical mode \def\tabu@LT@startpbox #1{% - \bgroup +%%TABU-FIXED add \color@begingroup + \bgroup\color@begingroup \let\@footnotetext\LT@p@ftntext \setlength\hsize{#1}% \@arrayparboxrestore diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 292e618978e..746c825420c 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2493,6 +2493,7 @@ $standardsource = '(\.(bat|c|drv|dtx|fea|fdd|ins|sfd)' 'ltximg', 'NULL', # doc, no need to build 'paper', 'install', 'seuthesis', 'NULL', # don't want to run iconv, etc. + 'tabu', 'NULL', # .dtx is not real 'thesis', 'install.01|install.ndx', 'translation-filecontents-de', 'NULL', # doc 'turnstile', 'turnstile-en.ins', # skip pt since it changes the sty -- cgit v1.2.3