[latex3-commits] [latex3/latex2e] latex-lab/uf-review-05: update tagpdfsetup keys in table (fd28bebb)
github at latex-project.org
github at latex-project.org
Wed Feb 7 17:02:13 CET 2024
Repository : https://github.com/latex3/latex2e
On branch : latex-lab/uf-review-05
Link : https://github.com/latex3/latex2e/commit/fd28bebb8ddf3b811ceef3e29668cc092ce42a8c
>---------------------------------------------------------------
commit fd28bebb8ddf3b811ceef3e29668cc092ce42a8c
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Wed Feb 7 17:02:13 2024 +0100
update tagpdfsetup keys in table
>---------------------------------------------------------------
fd28bebb8ddf3b811ceef3e29668cc092ce42a8c
required/latex-lab/latex-lab-table.dtx | 52 +++++++++++++++++-----
.../testfiles-table-luatex/table-009-pdf.pvt | 2 +-
.../latex-lab/testfiles-table-luatex/table-009.lvt | 2 +-
.../table-010-longtable-pdf.pvt | 2 +-
.../table-010-longtable-pdf2.pvt | 2 +-
.../testfiles-table-pdftex/table-008-disable.lvt | 4 +-
.../testfiles-table-pdftex/table-009-pdf.pvt | 2 +-
.../latex-lab/testfiles-table-pdftex/table-009.lvt | 2 +-
.../table-010-longtable-pdf.pvt | 2 +-
.../table-010-longtable-pdf2.pvt | 2 +-
10 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/required/latex-lab/latex-lab-table.dtx b/required/latex-lab/latex-lab-table.dtx
index c3788921..19113523 100644
--- a/required/latex-lab/latex-lab-table.dtx
+++ b/required/latex-lab/latex-lab-table.dtx
@@ -16,8 +16,8 @@
%
% for those people who are interested or want to report an issue.
%
-\def\ltlabtbldate{2024-01-18}
-\def\ltlabtblversion{0.85j}
+\def\ltlabtbldate{2024-02-07}
+\def\ltlabtblversion{0.85k}
%<*driver>
\documentclass{l3doc}
\EnableCrossrefs
@@ -117,7 +117,9 @@
% If a table should not be tagged as table, for example because it is merely used
% to produce a layout or because it is a not yet (fully) supported table structure,
% the tagging can be disabled with
-% \verb|\tagpdfsetup{table-tagging=false}| or with \verb|\tagpdfsetup{table-tagging=layout}|.
+% \verb|\tagpdfsetup{table/tagging=false}| or with \verb|\tagpdfsetup{table/tagging=layout}|.%
+% \footnote{The key has been renamed. The old name `table-tagging` still works but is
+% deprecated.}
% The first option disables the table tagging code and he content of the tabular
% is then treated more or less like running text. This works ok for simple tables using
% only hmode-cells (l/c/r) with normal text content, but fails if the table uses vmode-cells
@@ -131,9 +133,10 @@
% added with an empty TD-structure.
%
% There is some basic support\footnote{This is not meant to be the
-% final interface, though.} for headers. With
+% final interface, though.} for headers. With\footnote{The old key name \texttt{table-header-rows} still
+% works but is deprecated.}
% \begin{quote}
-% \verb|\tagpdfsetup{table-header-rows={|\meta{list of row numbers}\verb|}|
+% \verb|\tagpdfsetup{table/header-rows={|\meta{list of row numbers}\verb|}|
% \end{quote}
% you can
% declare which (absolute) row numbers should be tagged as header rows.
@@ -144,7 +147,7 @@
% for header columns yet. In a \env{longtable} the code will currently use the \cs{endhead} or
% \cs{endfirsthead} rows as header if one of these commands has been
% used and in that case the code
-% ignores a \texttt{table-header-rows} setting.
+% ignores a \texttt{table/header-rows} setting.
%
% You should not insert meaningful text with \verb+!{...}+ or \verb+@{...}+ or \cs{noalign}
% between the rows or columns of the table.
@@ -198,8 +201,8 @@
%
% \item Not every table should be tagged as a Table structure, often they are
% only used as layout help, e.g. to align authors in a title pages. In such uses
-% the tagging of the table must be deactivated with \verb|\tagpdfsetup{table-tagging=false}|
-% or \verb|\tagpdfsetup{table-tagging=layout}|.
+% the tagging of the table must be deactivated with \verb|\tagpdfsetup{table/tagging=false}|
+% or \verb|\tagpdfsetup{table/tagging=layout}|.
%
% \item Only simple header rows are currently supported. Columns and complex headers with
% subheaders will be handled later as that needs some syntax changes. Tables
@@ -864,7 +867,29 @@
% \end{macro}
% \begin{macrocode}
-% TODO decide about key name
+% See tagpdfsetup-keys.md in tagpdf/doc for the naming scheme.
+\keys_define:nn { __tag / setup }
+ {
+ table/tagging .choices:nn = { true, on }
+ { \__tag_tbl_enable: },
+ table/tagging .choices:nn = { false, off }
+ { \__tag_tbl_disable: },
+ table/tagging .choice:,
+ table/tagging / layout .code:n =
+ {
+ \__tag_tbl_enable:
+ \tl_set:Nn\l_@@_rowtag_tl {NonStruct}
+ \tl_set:Nn\l_@@_pcelltag_tl {NonStruct}
+ \tl_set:Nn\l_@@_celltag_tl {text}
+ \tl_set:Nn\l_@@_tabletag_tl {Div}
+ },
+ table/tagging .default:n = true,
+ table/tagging .initial:n = true
+ }
+% \end{macrocode}
+% This are the old key names kept for now for
+% compability. They will got at some time.
+% \begin{macrocode}
\keys_define:nn { __tag / setup }
{
table-tagging .choices:nn = { true, on }
@@ -1012,11 +1037,15 @@
% \end{macro}
%
% And some key support:
+% (See tagpdfsetup-keys.md for the naming scheme.)
% \begin{macrocode}
-% TODO decide about key name
\keys_define:nn { __tag / setup }
{
- table-header-rows .clist_set:N = \l_@@_header_rows_clist
+ table/header-rows .clist_set:N = \l_@@_header_rows_clist,
+% \end{macrocode}
+% obsolete older name:
+% \begin{macrocode}
+ table-header-rows .meta:n = {table/header-rows={#1}}
}
% \end{macrocode}
%
@@ -1045,7 +1074,6 @@
% \begin{macro}{\socket_use:nw}
%
% \begin{macrocode}
-
% this should not be protected
\cs_set:Npn \socket_use:nw #1 {
diff --git a/required/latex-lab/testfiles-table-luatex/table-009-pdf.pvt b/required/latex-lab/testfiles-table-luatex/table-009-pdf.pvt
index 46c89f75..63453c0f 100644
--- a/required/latex-lab/testfiles-table-luatex/table-009-pdf.pvt
+++ b/required/latex-lab/testfiles-table-luatex/table-009-pdf.pvt
@@ -11,7 +11,7 @@
\begin{document}
\START \showoutput
-\tagpdfsetup{table-header-rows={1,2,-1}}
+\tagpdfsetup{table/header-rows={1,2,-1}}
\begin{tabular}[t]{@{}l!{\hspace{1cm}}r@{}l}
head & head & head \\
\multicolumn{3}{c}{Head}\\
diff --git a/required/latex-lab/testfiles-table-luatex/table-009.lvt b/required/latex-lab/testfiles-table-luatex/table-009.lvt
index 01290c3f..c2d26d7c 100644
--- a/required/latex-lab/testfiles-table-luatex/table-009.lvt
+++ b/required/latex-lab/testfiles-table-luatex/table-009.lvt
@@ -12,7 +12,7 @@
\begin{document}
\START \showoutput
-\tagpdfsetup{table-header-rows={1,2,-1}}
+\tagpdfsetup{table/header-rows={1,2,-1}}
\begin{tabular}[t]{@{}l!{\hspace{1cm}}r@{}l}
head & head & head \\
\multicolumn{3}{c}{Head}\\
diff --git a/required/latex-lab/testfiles-table-luatex/table-010-longtable-pdf.pvt b/required/latex-lab/testfiles-table-luatex/table-010-longtable-pdf.pvt
index f3cc6ca8..d94fc7f3 100644
--- a/required/latex-lab/testfiles-table-luatex/table-010-longtable-pdf.pvt
+++ b/required/latex-lab/testfiles-table-luatex/table-010-longtable-pdf.pvt
@@ -7,7 +7,7 @@
\begin{document}
\START
%\showoutput
-%\tagpdfsetup{table-header-rows={1,2}}
+%\tagpdfsetup{table/header-rows={1,2}}
\begin{longtable}{cc}
head1 & head1 \\
head2 \endhead
diff --git a/required/latex-lab/testfiles-table-luatex/table-010-longtable-pdf2.pvt b/required/latex-lab/testfiles-table-luatex/table-010-longtable-pdf2.pvt
index 47e6d278..9b6b52b0 100644
--- a/required/latex-lab/testfiles-table-luatex/table-010-longtable-pdf2.pvt
+++ b/required/latex-lab/testfiles-table-luatex/table-010-longtable-pdf2.pvt
@@ -11,7 +11,7 @@
\begin{document}
\START
%\showoutput
-%\tagpdfsetup{table-header-rows={1,2}}
+%\tagpdfsetup{table/header-rows={1,2}}
\begin{longtable}{cc}
head1 & head1 \\
head2 \endhead
diff --git a/required/latex-lab/testfiles-table-pdftex/table-008-disable.lvt b/required/latex-lab/testfiles-table-pdftex/table-008-disable.lvt
index cfeb1ccd..d12c0162 100644
--- a/required/latex-lab/testfiles-table-pdftex/table-008-disable.lvt
+++ b/required/latex-lab/testfiles-table-pdftex/table-008-disable.lvt
@@ -6,12 +6,12 @@
\begin{document}
\START\showoutput
no tagging {
- \tagpdfsetup{table-tagging=false}
+ \tagpdfsetup{table/tagging=false}
\begin{tabular}{ll}a&b\\c&d \end{tabular}
}
layout tagging {
- \tagpdfsetup{table-tagging=layout}
+ \tagpdfsetup{table/tagging=layout}
\begin{tabular}{p{1cm}ll}a&b\\c&d & e \end{tabular}
}
diff --git a/required/latex-lab/testfiles-table-pdftex/table-009-pdf.pvt b/required/latex-lab/testfiles-table-pdftex/table-009-pdf.pvt
index 46c89f75..63453c0f 100644
--- a/required/latex-lab/testfiles-table-pdftex/table-009-pdf.pvt
+++ b/required/latex-lab/testfiles-table-pdftex/table-009-pdf.pvt
@@ -11,7 +11,7 @@
\begin{document}
\START \showoutput
-\tagpdfsetup{table-header-rows={1,2,-1}}
+\tagpdfsetup{table/header-rows={1,2,-1}}
\begin{tabular}[t]{@{}l!{\hspace{1cm}}r@{}l}
head & head & head \\
\multicolumn{3}{c}{Head}\\
diff --git a/required/latex-lab/testfiles-table-pdftex/table-009.lvt b/required/latex-lab/testfiles-table-pdftex/table-009.lvt
index 01290c3f..c2d26d7c 100644
--- a/required/latex-lab/testfiles-table-pdftex/table-009.lvt
+++ b/required/latex-lab/testfiles-table-pdftex/table-009.lvt
@@ -12,7 +12,7 @@
\begin{document}
\START \showoutput
-\tagpdfsetup{table-header-rows={1,2,-1}}
+\tagpdfsetup{table/header-rows={1,2,-1}}
\begin{tabular}[t]{@{}l!{\hspace{1cm}}r@{}l}
head & head & head \\
\multicolumn{3}{c}{Head}\\
diff --git a/required/latex-lab/testfiles-table-pdftex/table-010-longtable-pdf.pvt b/required/latex-lab/testfiles-table-pdftex/table-010-longtable-pdf.pvt
index f3cc6ca8..d94fc7f3 100644
--- a/required/latex-lab/testfiles-table-pdftex/table-010-longtable-pdf.pvt
+++ b/required/latex-lab/testfiles-table-pdftex/table-010-longtable-pdf.pvt
@@ -7,7 +7,7 @@
\begin{document}
\START
%\showoutput
-%\tagpdfsetup{table-header-rows={1,2}}
+%\tagpdfsetup{table/header-rows={1,2}}
\begin{longtable}{cc}
head1 & head1 \\
head2 \endhead
diff --git a/required/latex-lab/testfiles-table-pdftex/table-010-longtable-pdf2.pvt b/required/latex-lab/testfiles-table-pdftex/table-010-longtable-pdf2.pvt
index 47e6d278..9b6b52b0 100644
--- a/required/latex-lab/testfiles-table-pdftex/table-010-longtable-pdf2.pvt
+++ b/required/latex-lab/testfiles-table-pdftex/table-010-longtable-pdf2.pvt
@@ -11,7 +11,7 @@
\begin{document}
\START
%\showoutput
-%\tagpdfsetup{table-header-rows={1,2}}
+%\tagpdfsetup{table/header-rows={1,2}}
\begin{longtable}{cc}
head1 & head1 \\
head2 \endhead
More information about the latex3-commits
mailing list.