tabularray (16feb24)

git-svn-id: svn://tug.org/texlive/trunk@69906 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 25 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/latex/tabularray/README.txt b/Master/texmf-dist/doc/latex/tabularray/README.txt
index da1c4f4f1e8..1dc3aa0a7d6 100644
--- a/Master/texmf-dist/doc/latex/tabularray/README.txt
+++ b/Master/texmf-dist/doc/latex/tabularray/README.txt
@@ -1,5 +1,5 @@
 Package: Typeset tabulars and arrays with LaTeX3
-Copyright: 2021-2023 (c) Jianrui Lyu <tolvjr@163.com>
+Copyright: 2021-2024 (c) Jianrui Lyu <tolvjr@163.com>
 CTAN: https://ctan.org/pkg/tabularray
 Repository: https://github.com/lvjr/tabularray
 Repository: https://bitbucket.org/lvjr/tabularray
diff --git a/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf b/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf
index c5f94d11fc3..2726d20a9c8 100644
--- a/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf
+++ b/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf
diff --git a/Master/texmf-dist/doc/latex/tabularray/tabularray.tex b/Master/texmf-dist/doc/latex/tabularray/tabularray.tex
index 3c050a4537c..3a1404310fa 100644
--- a/Master/texmf-dist/doc/latex/tabularray/tabularray.tex
+++ b/Master/texmf-dist/doc/latex/tabularray/tabularray.tex
@@ -1,7 +1,7 @@
 % -*- coding: utf-8 -*-
 % !TEX program = lualatex
 \documentclass[oneside]{book}
-\newcommand*{\myversion}{2023A}
+\newcommand*{\myversion}{2024A}
 \newcommand*{\mylpad}[1]{\ifnum#1<10 0\the#1\else\the#1\fi}
 
 \usepackage[a4paper,margin=2.5cm]{geometry}
@@ -1570,6 +1570,7 @@ there are several other outer specifications which are described in Table~\ref{k
   \K{long} & change the table to a long table & \None \\
   \K{tall} & change the table to a tall table & \None \\
   \K{expand} & you need this key to use verb commands & \None \\
+  \K{expand+} & like \K{expand} but appends to previous values & \None \\
 \end{spectblr}
 
 \subsection{Set Baseline in Another Way}
@@ -1607,19 +1608,27 @@ In contrast to traditional \verb!tabular! environment, \verb!tabularray! environ
 need to see every \verb!&! and \verb!\\! when splitting the table body with \verb!l3regex!.
 And you can not put cell text inside any table command defined with \verb!\NewTableCommand!.
 But you could use outer key \verb!expand! to make \verb!tabularray! expand
-every occurrence of a specified macro \underline{once} before splitting the table body.
+every occurrence of any of the specified macros \underline{once} and \underline{in the given oder} before splitting the table body.
 Note that you \underline{can not} expand a command defined with \verb!\NewDocumentCommand!.
+You can also use \verb!expand+! if you still want to keep the macros in the current \verb!expand! setting.
 
 To expand a command without optional argument, you can define it with \verb!\newcommand!.
 
 \begin{demohigh}
-\newcommand*\tblrbody{
- \hline
+\newcommand*\tblrrowa{
   20 & 30 & 40 \\
+}
+\newcommand*\tblrrowb{
   50 & 60 & 70 \\
+}
+\newcommand*\tblrbody{
+ \hline
+  \tblrrowa
+  \tblrrowb
  \hline
 }
-\begin{tblr}[expand=\tblrbody]{ccc}
+\SetTblrOuter{expand=\tblrbody\tblrrowa}
+\begin{tblr}[expand+=\tblrrowb]{ccc}
  \hline
   AA & BB & CC \\
   \tblrbody
@@ -2865,6 +2874,16 @@ We can also use color series of \verb!xcolor! package to color table rows:
 \end{tblr}
 \end{demohigh}
 
+\section{Library \texttt{hook}}
+
+This library is experimental, please see\\
+\url{https://github.com/lvjr/tabularray/wiki/HooksAndVariables}.
+
+\section{Library \texttt{html}}
+
+This library is experimental, please see\\
+\url{https://github.com/lvjr/tabularray/wiki/HooksAndVariables}.
+
 \section{Library \texttt{nameref}}
 
 From version 2022D, you can load \verb!nameref! library