From d7a818c303519bc3e0e7e31313a9ccede42b766f Mon Sep 17 00:00:00 2001 From: lvjr Date: Sat, 30 Nov 2024 19:28:21 +0800 Subject: [PATCH] remove verb key (#530) --- manual/manual-3.tex | 14 -------------- manual/manual-6.tex | 6 +++--- tabularray.sty | 32 ++++---------------------------- tabularray.tex | 20 +++----------------- testfiles/verb-001.md5 | 1 - testfiles/verb-001.png | Bin 27652 -> 0 bytes testfiles/verb-001.tex | 40 ---------------------------------------- testfiles/verb-001.tlg | 20 -------------------- 8 files changed, 10 insertions(+), 123 deletions(-) delete mode 100644 testfiles/verb-001.md5 delete mode 100644 testfiles/verb-001.png delete mode 100644 testfiles/verb-001.tex delete mode 100644 testfiles/verb-001.tlg diff --git a/manual/manual-3.tex b/manual/manual-3.tex index ff61be2c..2127820e 100644 --- a/manual/manual-3.tex +++ b/manual/manual-3.tex @@ -166,20 +166,6 @@ \subsection{Hspan and Vspan Algorithms} \end{tblr} \end{demohigh} -\subsection{Use Verbatim Commands} - -%With \verb!verb! key, you can write \verb!\verb! commands in the cell text: -% -%\begin{demohigh} -%\begin{tblr}{hlines,verb} -% 20 & 30 & \verb!\hello{world}!40 \\ -% 50 & \verb!\hello!60 & 70 \\ -%\end{tblr} -%\end{demohigh} - -The inner key \verb!verb! is obsolete from version 2023A, and will be removed in the future. -Instead you can use more reliable \verb!\fakeverb! command (see Section \ref{sec:fakeverb}). - \subsection{Set Baseline for the Table} With \verb!baseline! key, you can set baseline for the table. diff --git a/manual/manual-6.tex b/manual/manual-6.tex index aa9a29ae..d4dce049 100644 --- a/manual/manual-6.tex +++ b/manual/manual-6.tex @@ -29,9 +29,9 @@ \section{Control Horizontal Alignment} \section{Use Safe Verbatim Commands}% \label{sec:fakeverb} -Due to the limitation of TeX, even if you have passed \texttt{verb} option to a -\texttt{tabularray} table, you still could not use some special characters in a -\verb!\verb! command. As an replacement, you may use \verb|\fakeverb| command from \href{https://www.ctan.org/pkg/codehigh}{\texttt{codehigh}} package. +Due to the limitations of TeX, +we are not able to make \fakeverb{\verb} command behave well inside \texttt{tabularray} tables. +As a replacement, you may use \fakeverb{\fakeverb} command from \href{https://www.ctan.org/pkg/codehigh}{\texttt{codehigh}} package. The \verb|\fakeverb| command will remove the backslashes in the following control symbols before typesetting its content: \fakeverb{\\\\}, \fakeverb{\\\{}, \fakeverb{\\\}}, \fakeverb{\\\#}, \fakeverb{\\\^} and \texttt{\textbackslash\textvisiblespace}, \fakeverb{\\\%}. diff --git a/tabularray.sty b/tabularray.sty index 44e3a460..48ac5b78 100644 --- a/tabularray.sty +++ b/tabularray.sty @@ -3056,7 +3056,6 @@ } \tl_new:N \l__tblr_inner_spec_measure_tl -\tl_new:N \l__tblr_inner_spec_verb_tl \cs_new_protected:Npn \__tblr_init_table_inner_spec: { @@ -3105,7 +3104,6 @@ { [\int_eval:n { \c@colcount + 1}] / ##1 } {##2} } \tl_clear:N \l__tblr_inner_spec_measure_tl - \tl_clear:N \l__tblr_inner_spec_verb_tl \keys_set:nv { tblr } { l__tblr_default_ \l__tblr_env_name_tl _inner_tl } } @@ -3119,7 +3117,7 @@ colspec, rowspec, column, row, cell, hline, vline, hborder, vborder, width, rowhead, rowfoot, columns, rows, cells, hlines, vlines, % hborders, vborders, leftsep, rightsep, colsep, abovesep, belowsep, rowsep, rulesep, - baseline, hspan, vspan, stretch, verb, delimiter + baseline, hspan, vspan, stretch, delimiter } \keys_define:nn { tblr } @@ -3130,8 +3128,6 @@ hspan .code:n = \__tblr_keys_gput:nn { hspan } {#1}, vspan .code:n = \__tblr_keys_gput:nn { vspan } {#1}, stretch .code:n = \__tblr_keys_gput:nn { stretch } {#1}, - verb .tl_set:N = \l__tblr_inner_spec_verb_tl, - verb .default:n = lite, columns .code:n = \__tblr_set_every_column_aux:n {#1}, rows .code:n = \__tblr_set_every_row_aux:n {#1}, cells .code:n = \__tblr_set_every_cell_aux:n {#1}, @@ -3782,7 +3778,7 @@ \begin{tblrNoHyper} \begin{varwidth}{\paperwidth} \l__tblr_f_tl - \__tblr_rescan_cell_tokens:N \l__tblr_c_tl + \l__tblr_c_tl \end{varwidth} \end{tblrNoHyper} } @@ -3801,7 +3797,7 @@ \hbox_set:Nn \l_tmpa_box { \l__tblr_f_tl - \__tblr_rescan_cell_tokens:N \l_tmpa_tl + \l_tmpa_tl } \tl_set:Nx \l__tblr_w_tl { \dim_max:nn { \l__tblr_w_tl } { \box_wd:N \l_tmpa_box } } @@ -3864,27 +3860,7 @@ \TblrParboxRestore \cs:w __tblr_halign_command_ \g__tblr_cell_halign_tl : \cs_end: \__tblr_leave_vmode: - \bool_if:NTF \l__tblr_cell_math_mode_bool - { #1 } - { \__tblr_rescan_cell_tokens:N #1 } - } - -%% When using verb option, there is an end-of-line character at the end. -%% This character causes extra horizontal space at the end when "measure=hbox", -%% or causes extra vertical space at the end with "measure=vbox". -%% Therefore we have to use an \empty to remove it. -%% See https://tex.stackexchange.com/q/213659 -\cs_new_protected:Npn \__tblr_rescan_cell_tokens:N #1 - { - \tl_if_empty:NTF \l__tblr_inner_spec_verb_tl - { #1 } - { - %% insert space characters after some control sequences first (issue #112) - \regex_replace_all:nnN { (\c{[A-Za-z]*}) ([A-Za-z]) } { \1 \ \2 } #1 - \regex_replace_all:nnN { . } { \c{string} \0 } #1 - \tl_set:Nx #1 { #1 \noexpand \empty } - \exp_args:NV \tex_scantokens:D #1 - } + #1 } %% #1: total height dimension; #2: head dimension; #3: foot dimension; diff --git a/tabularray.tex b/tabularray.tex index d7d11bdc..11068467 100644 --- a/tabularray.tex +++ b/tabularray.tex @@ -1525,20 +1525,6 @@ \subsection{Hspan and Vspan Algorithms} \end{tblr} \end{demohigh} -\subsection{Use Verbatim Commands} - -%With \verb!verb! key, you can write \verb!\verb! commands in the cell text: -% -%\begin{demohigh} -%\begin{tblr}{hlines,verb} -% 20 & 30 & \verb!\hello{world}!40 \\ -% 50 & \verb!\hello!60 & 70 \\ -%\end{tblr} -%\end{demohigh} - -The inner key \verb!verb! is obsolete from version 2023A, and will be removed in the future. -Instead you can use more reliable \verb!\fakeverb! command (see Section \ref{sec:fakeverb}). - \subsection{Set Baseline for the Table} With \verb!baseline! key, you can set baseline for the table. @@ -3125,9 +3111,9 @@ \section{Control Horizontal Alignment} \section{Use Safe Verbatim Commands}% \label{sec:fakeverb} -Due to the limitation of TeX, even if you have passed \texttt{verb} option to a -\texttt{tabularray} table, you still could not use some special characters in a -\verb!\verb! command. As an replacement, you may use \verb|\fakeverb| command from \href{https://www.ctan.org/pkg/codehigh}{\texttt{codehigh}} package. +Due to the limitations of TeX, +we are not able to make \fakeverb{\verb} command behave well inside \texttt{tabularray} tables. +As a replacement, you may use \fakeverb{\fakeverb} command from \href{https://www.ctan.org/pkg/codehigh}{\texttt{codehigh}} package. The \verb|\fakeverb| command will remove the backslashes in the following control symbols before typesetting its content: \fakeverb{\\\\}, \fakeverb{\\\{}, \fakeverb{\\\}}, \fakeverb{\\\#}, \fakeverb{\\\^} and \texttt{\textbackslash\textvisiblespace}, \fakeverb{\\\%}. diff --git a/testfiles/verb-001.md5 b/testfiles/verb-001.md5 deleted file mode 100644 index df43de5e..00000000 --- a/testfiles/verb-001.md5 +++ /dev/null @@ -1 +0,0 @@ -d6ffd5dd07e6e6b23f48a851ddc71894 \ No newline at end of file diff --git a/testfiles/verb-001.png b/testfiles/verb-001.png deleted file mode 100644 index ec6ee6bc5b67d7da928d7586d0f359beef6e9b4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27652 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 AbpQYW diff --git a/testfiles/verb-001.tex b/testfiles/verb-001.tex deleted file mode 100644 index 963f6d86..00000000 --- a/testfiles/verb-001.tex +++ /dev/null @@ -1,40 +0,0 @@ -\documentclass{article} -\usepackage[b5paper,margin=1cm]{geometry} -\pagestyle{empty} - -\input{regression-test} - -\usepackage{array} -\usepackage{tabularray} - -\SetTblrTracing{none} -\UseTblrLibrary{varwidth} - -\begin{document} - -\START -\hrule\bigskip - -\BEGINTEST{testing \verb command with measure=hbox} -\begin{tblr}{colspec={lll},hlines,verb,measure=hbox} - 20 & 30 & \verb!\hello{world}!40 \\ - 50 & \verb!\hello!60 & 70 \\ -\end{tblr} -\ENDTEST - -\BEGINTEST{testing \verb command with measure=vbox} -\begin{tblr}{colspec={lll},hlines,verb,measure=vbox} - 20 & 30 & \verb!\hello{world}!40 \\ - 50 & \verb!\hello!60 & 70 \\ -\end{tblr} -\ENDTEST - -%% Issue #112: verb option causes an error -\BEGINTEST{testing verb option and control sequences} -\begin{tblr}{verb} - \bfseries Text1 & \verb|\bfseries Text1| \\ - \sffamily 1Text & \verb|\sffamily 1Text| \\ -\end{tblr} -\ENDTEST - -\end{document} diff --git a/testfiles/verb-001.tlg b/testfiles/verb-001.tlg deleted file mode 100644 index 01724d8f..00000000 --- a/testfiles/verb-001.tlg +++ /dev/null @@ -1,20 +0,0 @@ -This is a generated file for the l3build validation system. -Don't change this file in any respect. -============================================================ -TEST 1: testing \verb command with measure=hbox -============================================================ -LaTeX Font Info: External font `cmex10' loaded for size -(Font) <7> on input line .... -LaTeX Font Info: External font `cmex10' loaded for size -(Font) <5> on input line .... -============================================================ -============================================================ -TEST 2: testing \verb command with measure=vbox -============================================================ -============================================================ -============================================================ -TEST 3: testing verb option and control sequences -============================================================ -============================================================ -[1 -] (verb-001.aux)