Patch 'array' and 'colortbl' (wip)

latex3 · Feb 8, 2023 · addb46a · addb46a
1 parent a7127bb
commit addb46a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.85.03869
+## Babel 3.85.03970
 
 (Draft)
 

diff --git a/babel.dtx b/babel.dtx
@@ -32,7 +32,7 @@
 %
 % \iffalse
 %<*filedriver>
-\ProvidesFile{babel.dtx}[2023/02/07 v3.85.03869 The Babel package]
+\ProvidesFile{babel.dtx}[2023/02/08 v3.85.03970 The Babel package]
 \documentclass{ltxdoc}
 \GetFileInfo{babel.dtx}
 \usepackage{fontspec}
@@ -5286,8 +5286,8 @@ help from Bernd Raichle, for which I am grateful.
 % \section{Tools}
 %
 %    \begin{macrocode}
-%<<version=3.85.03869>>
-%<<date=2023/02/07>>
+%<<version=3.85.03970>>
+%<<date=2023/02/08>>
 %    \end{macrocode}
 %
 % \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -15195,16 +15195,22 @@ end
   \ifx\@tabular\@undefined\else
     \bbl@replace\@tabular{$}{$%
       \def\bbl@insidemath{0}%
-      \def\bbl@parabefore{\babelrestoredirs}%
-      \everyhbox{\def\bbl@insidemath{0}}%
-      \everyvbox{\def\bbl@insidemath{0}}}%
+      \def\bbl@parabefore{\babelrestoredirs}}%
     \bbl@ifunset{@tabclassz}{}{%
       \bbl@sreplace\@tabclassz
-        {\ifcase\@chnum}{\bgroup\babelrestoredirs\ifcase\@chnum}%
-      \bbl@sreplace\@tabclassz
-        {\@sharp\unskip\fi}{\@sharp\unskip\fi\egroup}}
-    \fi
+        {\ifcase\@chnum}{\babelrestoredirs\ifcase\@chnum}}%
   \fi
+  \AtBeginDocument{%
+    \@ifpackageloaded{colortbl}%
+      {\bbl@sreplace\@classz
+        {\hbox\bgroup\bgroup}{\hbox\bgroup\bgroup\babelrestoredirs}}%
+      {\@ifpackageloaded{array}%
+         {\bbl@sreplace\@classz
+           {\ifcase\@chnum}{\bgroup\babelrestoredirs\ifcase\@chnum}%
+          \bbl@sreplace\@classz
+           {\do@row@strut\fi}{\do@row@strut\fi\egroup}}%
+         {}}}
+\fi
 \ifx\bbl@opt@layout\@nnil\endinput\fi  % if no layout
 %    \end{macrocode}
 %

diff --git a/babel.ins b/babel.ins
@@ -26,7 +26,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 %%
-\def\filedate{2023/02/07}
+\def\filedate{2023/02/08}
 \def\batchfile{babel.ins}
 \input docstrip.tex
 

diff --git a/babel.pdf b/babel.pdf
diff --git a/bbcompat.dtx b/bbcompat.dtx
@@ -30,7 +30,7 @@
 %
 % \iffalse
 %<*dtx>
-\ProvidesFile{bbcompat.dtx}[2023/02/07 v3.85.03869]
+\ProvidesFile{bbcompat.dtx}[2023/02/08 v3.85.03970]
 %</dtx>
 %
 %% File 'bbcompat.dtx'