texlive[74629] Master/texmf-dist: tabularray-abnt (15mar25)
commits+karl at tug.org
commits+karl at tug.org
Sat Mar 15 20:39:29 CET 2025
Revision: 74629
https://tug.org/svn/texlive?view=revision&revision=74629
Author: karl
Date: 2025-03-15 20:39:28 +0100 (Sat, 15 Mar 2025)
Log Message:
-----------
tabularray-abnt (15mar25)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/tabularray-abnt/changelog.txt
trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt-pt-br.pdf
trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt-pt-br.tex
trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt.bib
trunk/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt-2025A.sty
Modified: trunk/Master/texmf-dist/doc/latex/tabularray-abnt/changelog.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tabularray-abnt/changelog.txt 2025-03-15 14:52:03 UTC (rev 74628)
+++ trunk/Master/texmf-dist/doc/latex/tabularray-abnt/changelog.txt 2025-03-15 19:39:28 UTC (rev 74629)
@@ -1,3 +1,6 @@
+2025-03-14
+ - bug fix
+ - Better code for case of tabularray 2025-01-01
2025-01-16
- bug fix for case that some quadros appear as tables on list of quadros.
2025-01-06
Modified: trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt-pt-br.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt-pt-br.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt-pt-br.tex 2025-03-15 14:52:03 UTC (rev 74628)
+++ trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt-pt-br.tex 2025-03-15 19:39:28 UTC (rev 74629)
@@ -3,7 +3,7 @@
% tabularray-abnt.sty
%----------------------------------------------------------------------
-% copyright (C) January, 2025 by Sadao Massago
+% copyright 2025 (C) by Sadao Massago
% autor:
% Sadao Massago
% e-mail: sadao at ufscar.br
@@ -77,7 +77,7 @@
\title{Tabularray-abnt: tema abnt para tabularray}
\author{Sadao Massago}
-\date{2025/01/16}
+\date{2025/03/14}
%%%%%%%%%%%%%%%%%%%%%
% INÍCIO DO DOCUMENTO
@@ -114,7 +114,7 @@
O ambiente \texttt{tblr} (com opção \texttt{tall}) e \texttt{talltblr} podem ser usados para produzir tabelas dentro do ambiente de tabelas flutuante e
O ambiente \texttt{tblr} (com opção \texttt{long}) e \texttt{longtblr} produzem tabelas e quadros longos. Ao escolher tema \texttt{abnt} ou \texttt{quadro} para estes ambientes, poderá configurar para produzir tabela ou quadro compatível com a norma ABNT, com poucos ajustes.
-Para a comodidade, foram implementados ambientes \texttt{abnttblr}, \texttt{tallabnttblr} e \texttt{longabnttblr} que aplicam o tema \texttt{abnt} por padrão, além de permitir configurar a fonte usada pelo comando \verb+\SetAbntTblrFont+. Por exemplo, \verb+\SetAbntTblrFont{\footnotesize}+ configurará para que as fontes usadas enstas tabelas e quadros sejam no tamanho \verb+\footnotsize+.
+Para a comodidade, foram implementados ambientes \texttt{abnttblr}, \texttt{tallabnttblr} e \texttt{longabnttblr} que aplicam o tema \texttt{abnt} por padrão, além de permitir configurar a fonte usada pelo comando \verb+\SetAbntTblrFont+. Por exemplo, \verb+\SetAbntTblrFont{\footnotesize}+ configurará para que as fontes usadas nestas tabelas e quadros sejam no tamanho \verb+\footnotsize+.
Note que, para classe exceto o \texttt{abntexto}, será providenciado o ambiente \texttt{quadro} que funciona similarmente para tabelas, e para a classe \texttt{abntexto}, será criada a entrada de legenda ``quadro'' em vez do ambiente que funcionará devidamente como quadro.
@@ -189,7 +189,7 @@
\end{codehigh}
A Tabela~\ref{tab:longa} é uma tabela que ocupa várias páginas.
-Tal tabela pode ser criado pelo ambiente \texttt{longabnttblr}. Devido ao código implementado no \texttt{tabularray-abnt.sty}, precisa de duas compilações para que o cabeçalho seja ajustada devidamente.
+Tal tabela pode ser criado pelo ambiente \texttt{longabnttblr}. Devido ao código implementado no \texttt{tabularray-abnt.sty}, precisa de duas compilações para que o cabeçalho seja ajustado devidamente.
A Tabela~\ref{tab:longa} usa o pacote \texttt{siunitx} para converter os decimais em virgula, além de lidar com o seu alinhamento no decimal. Nesta tabela, foi usado a coloração de linhas em zebra (branco e cinza alternada) para facilitar o acompanhamento das linhas.
@@ -227,8 +227,14 @@
table-number-alignment=center % alinhar no decimal
}
+%\makeatletter
+%\global\let\if at tablularray@abnt at mark@spanpages\iftrue
+%\makeatother
+%\typeout{DEBUG: inicio de longtabntblr: page=\thepage}
+
\begin{longabnttblr}
[
+ %theme=abnt,
caption = {Tabela longa}, % titulo
label={tab:longa}, % rotulo para referências cruzadas
remark{Fonte}={Elaboração do autor},
@@ -257,10 +263,15 @@
linha 12 & 12.12 \\
linha 13 & 13.13 \\
linha 14 & 14.14 \\
- linha 15 & 15.15 \\
+ linha 15 & 15.15 \\
\bottomrule
\end{longabnttblr}
+%\typeout{DEBUG: final de longtabntblr: page=\thepage}
+%\makeatletter
+%\global\let\if at tablularray@abnt at mark@spanpages\iffalse
+%\makeatother
+
Quadro flutuante poderá ser produzido pelo ambiente \texttt{quadro}, exceto para classe \texttt{abntexto} (na qual deverá usar \texttt{table}, caso queira que seja flutuante), como no Quadro~\ref{quadro:flutuante}.
Para produzir o quadro, use o tema \texttt{quadro} fornecido pelo \texttt{tabularray-abnt.sty}, como em
@@ -303,6 +314,11 @@
O quadro longo pode ser produzido pelo tema \texttt{quadro} fornecido pelo \texttt{tabularray-abnt.sty}, sobre \texttt{longanbttblr} como no Exemplo~\ref{quadro:longo}.
+% Problema conhecida: Quando o inicio de uma tabela ficar no final de uma página, numa compilação, ficará em duas páginas sem a indicação de continuação da tabela e na próxima compilação, ficará tudo na próxima página, indicando que tem continuação. Isto repete. A causa disso é que o tamanho do título da tabela aumenta em uma linha quando tem a indicação de continuação (assim, não cabendo no final da página, ficará tudo na próxima página). Quando esta tudo na proxima página, agora o titulo nõ tem indicação de continuação, reduzindo em uma linha (logo, o inicio da tabela pode ser colocado no final da página anterior). Para resolver este problema, coloque a quebra de linha (\verb+\newpage+ antes da tabela para assegurar que o início da tabela não veha a ocorrer no final da página anterior.
+
+% \enlargethispage{1.3cm} % espaçamento exato faltando para ocorrer o roblema descrito anteriormente
+% \newpage % para contornar o problema
+
\begin{longabnttblr}
[
theme={quadro},
@@ -343,6 +359,10 @@
Para \texttt{tabularray}, veja o \textcite{book:tabularray:lyu}. Sobre \texttt{ABNTeX2} e \texttt{ABNText}, vejam \textcite{book:abnt2:araujo} e \textcite{book:abntexto:abreu}.
+\chapter{Problema conhecida}
+Quando o inicio de uma tabela ficar no final de uma página, numa compilação, ficará em duas páginas sem a indicação de continuação da tabela e na próxima compilação, ficará tudo na próxima página, indicando que tem continuação. Isto repete. A causa disso é que o tamanho do título da tabela aumenta em uma linha quando tem a indicação de continuação (assim, não cabendo no final da página, ficará tudo na próxima página). Quando esta tudo na próxima página, agora o título não tem indicação de continuação, reduzindo em uma linha (logo, o inicio da tabela pode ser colocado no final da página anterior). Como a informação de continuação é referente à compilação anterior, a indicação de compilação ficará inconsistente.
+Para resolver este problema, coloque a quebra de linha (\verb+\newpage+ antes da tabela para assegurar que o início da tabela não venha a ocorrer no final da página anterior.
+
\chapter{Código}
%\CodeHigh{lite}
Modified: trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt.bib 2025-03-15 14:52:03 UTC (rev 74628)
+++ trunk/Master/texmf-dist/doc/latex/tabularray-abnt/tabularray-abnt.bib 2025-03-15 19:39:28 UTC (rev 74629)
@@ -31,9 +31,9 @@
author={Jianrui Lyu},
title={Tabularray: Typeset Tabulars and Arrays with {\LaTeX}3},
url={https://ctan.org/pkg/tabularray},
-lastchecked={2025-01-03},
-urldate={2025-01-03},
-year=2024
+lastchecked={2025-03-14},
+urldate={2025-03-14},
+year=2025
}
@comment{note="URL: {\url{https://ctan.org/pkg/tabularray}}",}
Added: trunk/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt-2025A.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt-2025A.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt-2025A.sty 2025-03-15 19:39:28 UTC (rev 74629)
@@ -0,0 +1,482 @@
+%%% % -*- coding: utf-8 -*-
+%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% % tabularray-abnt.sty
+%%% %----------------------------------------------------------------------
+%%% % copyright (C) January, 2025 by Sadao Massago
+%%% % autor:
+%%% % Sadao Massago
+%%% % e-mail: sadao at ufscar.br
+%%% %
+%%% % Licença: LaTeX Project Public License versão 1.3c or (se for a sua escolha) qualquer versão posterior.
+%%% % https://www.latex-project.org/lppl/
+%%% %----------------------------------------------------------------------
+
+%% Need LaTeX 2e version 2020-10-01 or latter (due to AddToHoock)
+\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+
+\DeclareCurrentRelease{}{2025-01-16}
+
+%%% file name
+
+\ProvidesPackage{tabularray-abnt-2025A}[2025/01/16 tabularray-abnt style (require tabularray package)]
+%\typeout{tabularray-abnt style 2025-01-16 <January/2025>.}
+
+%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% It not works on older LaTeX compatibility mode (documentstyle)
+
+\if at compatibility
+ \PackageError{tabularray-abnt}{Not support older compatible mode (documentstyle)}
+ {Use documentclass instead of documentstyle}
+ \endinput
+\else
+ %% OK
+\fi
+
+%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% In way to adjust on memoir (ex. abntex2) or abntexto as document class
+
+\newif\if at tabularray@abnt at using@memoir
+\newif\if at tabularray@abnt at using@abntexto
+\@tabularray at abnt@using at memoirfalse
+\@tabularray at abnt@using at abntextofalse
+\@ifclassloaded{memoir}% Using memoir?
+{\@tabularray at abnt@using at memoirtrue}% YES
+{
+ \@ifclassloaded{abntexto}% Using ABNTexto?
+ {\@tabularray at abnt@using at abntextotrue}% YES
+ { % generic class
+ \RequirePackage{float}
+ }
+}
+
+%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Required package
+
+\RequirePackage{tabularray}
+\UseTblrLibrary{hook}
+
+%%% %----------------------
+%%> \section{ABNT theme}
+
+%% ABNT theme for table
+\NewTblrTheme{abnt}{
+ \DefTblrTemplate{caption-sep}{default}{\space ---\space}% default is ": \space"
+ \SetTblrTemplate{firsthead-text,lasthead-text,conthead-text}{abnt}
+ \SetTblrTemplate{caption,lasthead,capcont}{abnt}
+ \DefTblrTemplate{firstfoot,middlefoot}{default}{}% disabling the first and middle footnote
+
+%%% \SetTblrTemplate{lastfoot-text,lastfoot-text-note}{abnt}
+
+ %% for abntexto, need to change lot write
+ \if at tabularray@abnt at using@abntexto
+ \SetTblrTemplate{caption-lot}{abnt}
+ \fi
+
+ \SetTblrTemplate{remark-tag}{abnt}
+ \SetTblrTemplate{remark}{abnt}
+
+ \SetTblrStyle{caption,lasthead,capcont}{font=\normalsize}
+ \SetTblrStyle{firsthead-text,lasthead-text,conthead-text}{font=\footnotesize}
+ \SetTblrStyle{lastfoot}{font=\footnotesize}
+}
+
+%%% Example of how to insert value from parameter
+%%% %\DefTblrTemplate{caption-text}{default}{\InsertTblrText{caption}
+
+%%% ---------------------------------
+%% theme ``quadro'' (text only table)
+
+%%% % Caution: Avoid space between braces and parameters
+\NewTblrTheme{quadro}{
+ %% same as abnt theme of table
+ \DefTblrTemplate{caption-sep}{default}{\space ---\space}% default is ": \space"
+ \SetTblrTemplate{firsthead-text,lasthead-text,conthead-text}{abnt}
+ \SetTblrTemplate{caption,lasthead,capcont}{abnt}
+ \DefTblrTemplate{firstfoot,middlefoot}{default}{}% desabling first and middle footnote
+
+%%% \SetTblrTemplate{lastfoot-text,lastfoot-text-note}{abnt}
+
+%%% %% for abntexto, need to change lot write
+%%% \if at tabularray@abnt at using@abntexto
+%%% %%\SetTblrTemplate{caption-lot}{abnt}
+%%% \fi
+
+ \SetTblrTemplate{remark-tag}{abnt}
+ \SetTblrTemplate{remark}{abnt}
+
+ \SetTblrStyle{caption,lasthead,capcont}{font=\normalsize}
+ \SetTblrStyle{firsthead-text,lasthead-text,conthead-text}{font=\footnotesize}
+ \SetTblrStyle{lastfoot}{font=\footnotesize}
+
+ %% Change specific for ``quadro'
+ \SetTblrTemplate{caption-tag}{quadro} % caption change
+ \SetTblrTemplate{caption-lot}{quadro} % lot wire change
+}
+
+%%% -----------------------------
+%%> \section{Setup table as ABNT}
+
+%% counter of table are not nested
+
+\ifdefined\chapter
+ \counterwithout{table}{chapter}
+\else
+ \ifdefined\section
+ \counterwithout{table}{section}
+ \fi
+\fi
+
+%% counting table and quadro together
+
+%%% \ExplSyntaxOn
+\if at tabularray@abnt at using@abntexto
+
+%%% \newcommand{\tabularray at abnt@tblr at count@roman}{\romannumeral\inteval{\g__tblr_table_count_int + \countquadro}}
+ \newcommand{\tabularray at abnt@tblr at count@roman}{\romannumeral\inteval{\value{table} + \countquadro}}
+\else
+
+%%% \newcommand{\tabularray at abnt@tblr at count@roman}{\romannumeral\inteval{\g__tblr_table_count_int + \value{quadro}}}
+ \newcommand{\tabularray at abnt@tblr at count@roman}{\romannumeral\inteval{\value{table} + \value{quadro}}}
+\fi
+
+%%% \ExplSyntaxOff
+
+%% additional text for header
+\DefTblrTemplate{firsthead-text}{abnt}{\par~\hfill(continua)} % first header
+\DefTblrTemplate{lasthead-text}{abnt}{\par~\hfill(conclusão)} % last header
+\DefTblrTemplate{conthead-text}{abnt}{\par~\hfill(continuação)} % middle header
+%% first header
+\DefTblrTemplate{caption}{abnt}{
+ \UseTblrTemplate{caption-tag}{default}
+ \UseTblrTemplate{caption-sep}{default}
+ \UseTblrTemplate{caption-text}{default}
+
+%%% % like \ifdefined, but with csname
+ \ifcsname tabularray at abnt@tblr at spanpages@\tabularray at abnt@tblr at count@roman\endcsname % if span pages
+ \UseTblrTemplate{firsthead-text}{abnt} % add the firsthead-text
+
+%%% DEBUG:\tabularray at abnt@tblr at count@roman
+%%% \else
+%%% DEBUG (no span pages): \roman{tabularray at abnt@global at tblr@counter}
+ \fi
+}
+
+%% redefine last head title
+\DefTblrTemplate{lasthead}{abnt}{
+ \UseTblrTemplate{caption-tag}{default}
+ \UseTblrTemplate{caption-sep}{default}
+ \UseTblrTemplate{caption-text}{default}
+ \UseTblrTemplate{lasthead-text}{abnt} % add lasthead-text
+}
+%% redefine middle head title
+\DefTblrTemplate{capcont}{abnt}{
+ \UseTblrTemplate{caption-tag}{default}
+ \UseTblrTemplate{caption-sep}{default}
+ \UseTblrTemplate{caption-text}{default}
+ \UseTblrTemplate{conthead-text}{abnt}
+}
+
+%%% %-------------------------------------------------
+%%> \section{To save ``page span'' status}
+
+\newif\if at tablularray@abnt at mark@spanpages
+
+%%% \AtBeginDocument{%
+
+%%% % \@tablularray at abnt@mark at spanpagesfalse % initially false
+\global\let\if at tablularray@abnt at mark@spanpages\iffalse
+
+%%% } % \AtBeginDocument{%
+
+%%% version 2021 does not have hook point!
+%%%% hook tabularray not work for version 2021 (not have hook point). Need more recente version (2024) of tabularray
+%%%\AddToHook{tabularray/table/before}
+%%%{
+%%%
+%%%%%% % \@tablularray at abnt@mark at spanpagestrue
+%%% \global\let\if at tablularray@abnt at mark@spanpages\iftrue
+%%% \typeout{DEBUG: start tblr: page=\thepage; table=\thetable; quadro=\thequadro; table+quadro count=\tabularray at abnt@tblr at count@roman}
+%%%}
+%%% \AddToHook{tabularray/table/after}
+%%% {
+%%%
+%%%%%%% \@tablularray at abnt@mark at spanpagesfalse
+%%% \global\let\if at tablularray@abnt at mark@spanpages\iffalse
+%%% \typeout{DEBUG: end tblr: page=\thepage; table=\thetable; quadro=\thequadro; table+quadro count=\tabularray at abnt@tblr at count@roman}
+%%% }
+
+%%% % check page span status for longtblr
+\AddToHook{env/longtblr/before}{ \global\let\if at tablularray@abnt at mark@spanpages\iftrue }
+\AddToHook{env/longtblr/after}{ \global\let\if at tablularray@abnt at mark@spanpages\iffalse }
+
+%%% % check page span status for tblr (with possible long option)
+\AddToHook{env/tblr/before}{ \global\let\if at tablularray@abnt at mark@spanpages\iftrue }
+\AddToHook{env/tblr/after}{ \global\let\if at tablularray@abnt at mark@spanpages\iffalse }
+
+%%% \AddToHook{env/longtblr/begin}
+%%% {
+%%% % \@tablularray at abnt@mark at spanpagestrue
+%%% \global\let\if at tablularray@abnt at mark@spanpages\iftrue
+%%% }
+
+%%% \AddToHook{env/longtblr/end}
+%%% {
+
+%%% \@tablularray at abnt@mark at spanpagesfalse
+%%% \global\let\if at tablularray@abnt at mark@spanpages\iffalse
+%%% }
+
+%%% % For tblr with long opcion
+%%% \AddToHook{env/tblr/begin}
+%%% {
+%%% % \@tablularray at abnt@mark at spanpagestrue
+%%% \global\let\if at tablularray@abnt at mark@spanpages\iftrue
+%%% }
+
+%%% \AddToHook{env/tblr/end}
+%%% {
+%%% % \@tablularray at abnt@mark at spanpagesfalse
+%%% \global\let\if at tablularray@abnt at mark@spanpages\iffalse
+%% }
+
+%%% talltblr fit in single page (no hook)
+
+%% if change pages, mark as ``span pages'' on aux file
+
+%%% \AddToHook{shipout/after}
+\AddToHook{shipout/after}
+{
+ % \typeout{DEBUG: page changed}
+
+ \if at tablularray@abnt at mark@spanpages
+ %% to the associated commands act globally
+ %% tip from https://tex.stackexchange.com/questions/115932/on-the-basics-of-writing-to-reading-from-auxiliary-files-aux-toc-etc
+ \immediate\write\@auxout{\gdef\string\tabularray at abnt@tblr at spanpages@\tabularray at abnt@tblr at count@roman{true}}
+%%% %\typeout{DEBUG: table span pages. count=\tabularray at abnt@tblr at count@roman}
+
+%%% \else % DEBUG
+%%% \immediate\write\@auxout{\gdef\string\tabularray at abnt@tblr at spanpages@\tabularray at abnt@tblr at count@roman{false}}
+
+\fi
+ %% to the associated commands act globally
+ %% tip from https://tex.stackexchange.com/questions/566884/setting-a-newif-to-false-ignored-on-first-check-in-custom-itemize-environment
+ \global\let\if at tablularray@abnt at mark@spanpages\iffalse
+
+%%% % DEBUG:
+%%% \immediate\write\@auxout{\gdef\string\tabularray at abnt@shipout at message{DEGUB: page=\thepage, tblrnum=\tabularray at abnt@tblr at count@roman}}
+}
+
+%% For abntexto class, need change the form to write on ``lot''
+%% For others, only add global counter
+\if at tabularray@abnt at using@abntexto
+ \ExplSyntaxOn
+ \DefTblrTemplate{caption-lot}{abnt}
+ {
+ \tl_if_empty:NTF \lTblrEntryTl
+ {\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl}
+ {\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrEntryTl}
+ %% \addcontentsline { lot } { table }
+ %% { \protect\numberline { \thetable } { \l__tblr_caption_short_tl } }
+ %% add on list of tables using command from abntexto
+ \addtoext{lot}{lofi}{\protect\lotlabelbox{\thetable}{\l__tblr_caption_short_tl}}
+ }
+ \ExplSyntaxOff
+%%%\else% \if at tabularray@abnt at using@abntexto
+%%% \ExplSyntaxOn
+%%% \DefTblrTemplate {caption-lot}{abnt}
+%%% {
+%%%
+%%% %% \stepcounter{tabularray at abnt@global at tblr@counter}% global table/quadro counter
+%%% \tl_if_empty:NTF \lTblrEntryTl
+%%% { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl }
+%%% { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrEntryTl }
+%%% \addcontentsline { lot } { table }
+%%% { \protect\numberline { \thetable } { \l__tblr_caption_short_tl } }
+%%% }
+%%% \ExplSyntaxOff
+\fi% \if at tabularray@abnt at using@abntexto
+
+%% Change remark to use for source and note as ABNT
+\DefTblrTemplate{remark-tag}{abnt}{\InsertTblrRemarkTag}
+
+%% Change left margin using tip from
+%% https://tex.stackexchange.com/questions/645175/how-to-indent-notes-in-tabularray
+\newlength\tabularray at abnt@remark at labellength
+\DefTblrTemplate{remark}{abnt}{%
+ \MapTblrRemarks{%
+ \settowidth{\tabularray at abnt@remark at labellength}{\UseTblrTemplate{remark-tag}{abnt}\UseTblrTemplate{remark-sep}{default}}%
+ \UseTblrTemplate{remark-tag}{abnt}\UseTblrTemplate{remark-sep}{default}%
+ \parbox[t]{\dimexpr\linewidth-\tabularray at abnt@remark at labellength}{\UseTblrTemplate{remark-text}{default}}%
+ \par}\medskip
+}
+
+%%% %-------------------
+%%> \section{``Quadro'' (text only table)}
+
+%%% %------------------
+%% On the abntexto class, create legend entry named ``quadro''. In other cases, create environment ``quadro''.
+
+%% Names
+\providecommand{\quadroname}{Quadro}
+\providecommand{\listquadroname}{Lista de quadros}
+\@ifpackageloaded{babel}{
+ \ifdefined\captionsportugese
+ \addto\captionsportugese{% portugese
+ \renewcommand{\quadroname}{Quadro}
+ \renewcommand{\listquadroname}{Lista de quadros}
+ }
+ \fi
+ \ifdefined\captionsbrazil
+ \addto\captionsbrazil{% brazilian portugese
+ \renewcommand{\quadroname}{Quadro}
+ \renewcommand{\listquadroname}{Lista de quadros}
+ }
+ \fi
+ \ifdefined\captionsbrazilian
+ \addto\captionsbrazilian{% brazilian portugese
+ \renewcommand{\quadroname}{Quadro}
+ \renewcommand{\listquadroname}{Lista de quadros}
+ }
+ \fi
+ \ifdefined\captionsenglish
+ \addto\captionsenglish{% English
+ \renewcommand{\quadroname}{Text table}
+ \renewcommand{\listquadroname}{List of text table}
+ }
+ \fi
+}{} % \@ifpackageloaded{babel}{
+
+%% define for each class
+
+%% ABNTexto class
+\if at tabularray@abnt at using@abntexto % ABNTexto.
+ %% using command from ABNTexto
+ \definelegendplace{quadro}{Quadro}{quad.\,}{loq} % new legend entry
+
+ \ifdefined\chapter
+ \newcommand{\listadequadros}{\notoc\nonum\chapter{\listquadroname}\makeloq}
+ \else
+ \newcommand{\listadequadros}{\notoc\nonum\section{\listquadroname}\makeloq}
+ \fi
+ %% Caution: don't put space between braces and parameters
+ \DefTblrTemplate{caption-tag}{quadro}{\quadroname\hspace{0.25em}\the\countquadro}
+
+ \ExplSyntaxOn
+ \DefTblrTemplate{caption-lot}{quadro}
+ {
+
+%%% \stepcounter{tabularray at abnt@global at tblr@counter}% global table/quadro counter
+ \addtocounter{table}{-1}%Não contar como table
+ %% counter created by \definelegendplace{quadro} is not \c at quadro+, but \countquadro, and is necessary to use TeX command to increase
+ \global\advance\countquadro by 1% count as ``quadro''
+ \tl_if_empty:NTF \lTblrEntryTl
+ {\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl}
+ {\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrEntryTl}
+ %% add to list of ``quadro'' using command from abntexto
+ \addtoext{loq}{loqi}{\protect\loqlabelbox{\the\countquadro} {\l__tblr_caption_short_tl}}%
+ }
+ \ExplSyntaxOff
+\else %% memoir (ABNTeX2 or like) or generic class
+ \if at tabularray@abnt at using@memoir %% memoir (ABNTeX2 or like)
+
+%%% %\newfloat[chapter]{quadro}{loq}{\quadroname}
+%%% %\counterwithout{quadro}{chapter}
+ %% using command from memoir
+ \newfloat{quadro}{loq}{\quadroname}
+ \newlistof{listadequadros}{loq}{\listquadroname}
+
+%%% %\newlistentry[chapter]{quadro}{loq}{0}
+ \newlistentry{quadro}{loq}{0}
+
+ \cftsetindents{quadro}{0em}{2.3em}
+ \renewcommand{\cftquadroname}{\quadroname\space}
+ \renewcommand*{\cftquadroaftersnum}{\hfill\textendash\hfill}
+ \else %% generic class
+ %% using float package
+ \newcommand{\listadequadros}{\listof{quadro}{\listofquadrosname}}
+ \newfloat{quadro}{tbp}{loq}%[chapter]
+
+%%% %\counterwithout{quadro}{chapter} counter not nested frm chapter
+ \fi
+
+%%% % We need to use \hspace and \enskip, but not ~ or \space,
+%%% % since we want a correct hangindent caption paragraph.
+ \DefTblrTemplate{caption-tag}{quadro}{\quadroname\hspace{0.25em}\thequadro}
+
+ \ExplSyntaxOn
+ \DefTblrTemplate{caption-lot}{quadro}
+ {
+
+%%% \stepcounter{tabularray at abnt@global at tblr@counter}% global table/quadro counter
+ \addtocounter{table}{-1}% not count as table
+ \stepcounter{quadro}% count as quadro
+ \tl_if_empty:NTF \lTblrEntryTl
+ { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl }
+ { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrEntryTl }
+ \addcontentsline { loq } { quadro }
+ { \protect\numberline { \thequadro } { \l__tblr_caption_short_tl } }
+ }
+ \ExplSyntaxOff
+\fi
+
+%%% %------------------------------
+%%> \section{New table environment}
+%% New environment as wrapper for tblr, instead of new tblr, in way to support table font settings
+
+%% To set table font for new envrronment
+\NewDocumentCommand{\SetAbntTblrFont}{+m}
+{
+ \gdef\@tabularray at abnt@tblr at font{#1}
+}
+
+%%% % New environments for tables
+\NewDocumentEnvironment{abnttblr}{+o +m +b}{
+\ifdefined\@tabularray at abnt@tblr at font \@tabularray at abnt@tblr at font \fi
+\begin{tblr}[theme=abnt,#1]{#2}
+#3
+\end{tblr}
+}{}
+
+\NewDocumentEnvironment{tallabnttblr}{+o +m +b}{
+
+%%% tallabnttblr begin
+%%% \if at tablularray@abnt at mark@spanpages
+%%% DEBUG: mark span pages active
+%%% \fi
+%%% table+quadro counter = \tabularray at abnt@tblr at count@roman
+\ifdefined\@tabularray at abnt@tblr at font \@tabularray at abnt@tblr at font \fi
+\begin{talltblr}[theme=abnt,#1]{#2}
+#3
+\end{talltblr}
+
+%%% tallabnttblr end
+%%% \if at tablularray@abnt at mark@spanpages
+%%% DEBUG: mark span pages active
+%%% \fi
+%%% table+quadro counter = \tabularray at abnt@tblr at count@roman
+}{}
+
+\NewDocumentEnvironment{longabnttblr}{+o +m +b}{
+
+%%% longabnttblr begin
+%%% \if at tablularray@abnt at mark@spanpages
+%%% DEBUG: mark span pages active
+%%% \fi
+%%% table+quadro counter = \tabularray at abnt@tblr at count@roman
+%%% \global\let\if at tablularray@abnt at mark@spanpages\iftrue
+\ifdefined\@tabularray at abnt@tblr at font \@tabularray at abnt@tblr at font \fi
+\begin{longtblr}[theme=abnt,#1]{#2}
+#3
+\end{longtblr}
+
+%%% \global\let\if at tablularray@abnt at mark@spanpages\iffalse
+
+%%% longabnttblr end
+%%% \if at tablularray@abnt at mark@spanpages
+%%% DEBUG: mark span pages active
+%%% \fi
+%%% table+quadro counter = \tabularray at abnt@tblr at count@roman
+}{}
+
+%% end: tabularray-abnt.sty
+
Property changes on: trunk/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt-2025A.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt.sty 2025-03-15 14:52:03 UTC (rev 74628)
+++ trunk/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt.sty 2025-03-15 19:39:28 UTC (rev 74629)
@@ -2,7 +2,7 @@
%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% % tabularray-abnt.sty
%%% %----------------------------------------------------------------------
-%%% % copyright (C) January, 2025 by Sadao Massago
+%%% % copyright: 2025 (C) by Sadao Massago
%%% % autor:
%%% % Sadao Massago
%%% % e-mail: sadao at ufscar.br
@@ -14,13 +14,15 @@
%% Need LaTeX 2e version 2020-10-01 or latter (due to AddToHoock)
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-%%% file name
-\ProvidesFile{tabularray-abnt.sty}
- [2025/01/16 tabularray-abnt style (require tabularray package)]
-\typeout{tabularray-abnt style 2025-01-16 <January/2025>.}
+% Releases
+\DeclareRelease{}{2025-01-16}{tabularray-2025A.sty}
+\DeclareCurrentRelease{}{2025-03-14}
+%%% package name
+\ProvidesPackage{tabularray-abnt}[2025/03/14 tabularray-abnt style (require tabularray package)]
+
%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% It not works on older LaTeX compatibility mode (documentstyle)
+%% Does not works on older LaTeX compatibility mode (documentstyle)
\if at compatibility
\PackageError{tabularray-abnt}{Not support older compatible mode (documentstyle)}
@@ -30,6 +32,16 @@
%% OK
\fi
+%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Required package
+
+\RequirePackage{tabularray}
+\UseTblrLibrary{hook}
+
+% If tabularray is old, use old abularray-abnt too.
+\IfPackageAtLeastTF{tabularray}{2025-01-01}{}{\RequirePackage{tabularray-abnt-2025A}\endinput}
+
+
%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% In way to adjust on memoir (ex. abntex2) or abntexto as document class
@@ -42,26 +54,20 @@
{
\@ifclassloaded{abntexto}% Using ABNTexto?
{\@tabularray at abnt@using at abntextotrue}% YES
- { % generic class
+ { % generic class: require float package for this case
\RequirePackage{float}
}
}
-%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Required package
-
-\RequirePackage{tabularray}
-\UseTblrLibrary{hook}
-
%%% %----------------------
%%> \section{ABNT theme}
%% ABNT theme for table
\NewTblrTheme{abnt}{
- \DefTblrTemplate{caption-sep}{default}{\space ---\space}% default is ": \space"
+ \DeclareTblrTemplate{caption-sep}{default}{\space ---\space}% default is ": \space"
\SetTblrTemplate{firsthead-text,lasthead-text,conthead-text}{abnt}
\SetTblrTemplate{caption,lasthead,capcont}{abnt}
- \DefTblrTemplate{firstfoot,middlefoot}{default}{}% disabling the first and middle footnote
+ \DeclareTblrTemplate{firstfoot,middlefoot}{default}{}% disabling the first and middle footnote
%%% \SetTblrTemplate{lastfoot-text,lastfoot-text-note}{abnt}
@@ -79,7 +85,7 @@
}
%%% Example of how to insert value from parameter
-%%% %\DefTblrTemplate{caption-text}{default}{\InsertTblrText{caption}
+%%% %\DeclareTblrTemplate{caption-text}{default}{\InsertTblrText{caption}
%%% ---------------------------------
%% theme ``quadro'' (text only table)
@@ -87,18 +93,13 @@
%%% % Caution: Avoid space between braces and parameters
\NewTblrTheme{quadro}{
%% same as abnt theme of table
- \DefTblrTemplate{caption-sep}{default}{\space ---\space}% default is ": \space"
+ \DeclareTblrTemplate{caption-sep}{default}{\space ---\space}% default is ": \space"
\SetTblrTemplate{firsthead-text,lasthead-text,conthead-text}{abnt}
\SetTblrTemplate{caption,lasthead,capcont}{abnt}
- \DefTblrTemplate{firstfoot,middlefoot}{default}{}% desabling first and middle footnote
+ \DeclareTblrTemplate{firstfoot,middlefoot}{default}{}% desabling first and middle footnote
%%% \SetTblrTemplate{lastfoot-text,lastfoot-text-note}{abnt}
-
-%%% %% for abntexto, need to change lot write
-%%% \if at tabularray@abnt at using@abntexto
-%%% %%\SetTblrTemplate{caption-lot}{abnt}
-%%% \fi
-
+
\SetTblrTemplate{remark-tag}{abnt}
\SetTblrTemplate{remark}{abnt}
@@ -108,7 +109,7 @@
%% Change specific for ``quadro'
\SetTblrTemplate{caption-tag}{quadro} % caption change
- \SetTblrTemplate{caption-lot}{quadro} % lot wire change
+ \SetTblrTemplate{caption-lot}{quadro} % lot write change
}
%%% -----------------------------
@@ -128,39 +129,30 @@
%%% \ExplSyntaxOn
\if at tabularray@abnt at using@abntexto
-
-%%% \newcommand{\tabularray at abnt@tblr at count@roman}{\romannumeral\inteval{\g__tblr_table_count_int + \countquadro}}
\newcommand{\tabularray at abnt@tblr at count@roman}{\romannumeral\inteval{\value{table} + \countquadro}}
\else
-
-%%% \newcommand{\tabularray at abnt@tblr at count@roman}{\romannumeral\inteval{\g__tblr_table_count_int + \value{quadro}}}
\newcommand{\tabularray at abnt@tblr at count@roman}{\romannumeral\inteval{\value{table} + \value{quadro}}}
\fi
-
%%% \ExplSyntaxOff
%% additional text for header
-\DefTblrTemplate{firsthead-text}{abnt}{\par~\hfill(continua)} % first header
-\DefTblrTemplate{lasthead-text}{abnt}{\par~\hfill(conclusão)} % last header
-\DefTblrTemplate{conthead-text}{abnt}{\par~\hfill(continuação)} % middle header
+\DeclareTblrTemplate{firsthead-text}{abnt}{\par~\hfill(continua)} % first header
+\DeclareTblrTemplate{lasthead-text}{abnt}{\par~\hfill(conclusão)} % last header
+\DeclareTblrTemplate{conthead-text}{abnt}{\par~\hfill(continuação)} % middle header
%% first header
-\DefTblrTemplate{caption}{abnt}{
+\DeclareTblrTemplate{caption}{abnt}{
\UseTblrTemplate{caption-tag}{default}
\UseTblrTemplate{caption-sep}{default}
\UseTblrTemplate{caption-text}{default}
-%%% % like \ifdefined, but with csname
+%%% % \ifcsname is like \ifdefined, but with csname
\ifcsname tabularray at abnt@tblr at spanpages@\tabularray at abnt@tblr at count@roman\endcsname % if span pages
\UseTblrTemplate{firsthead-text}{abnt} % add the firsthead-text
-
-%%% DEBUG:\tabularray at abnt@tblr at count@roman
-%%% \else
-%%% DEBUG (no span pages): \roman{tabularray at abnt@global at tblr@counter}
\fi
}
%% redefine last head title
-\DefTblrTemplate{lasthead}{abnt}{
+\DeclareTblrTemplate{lasthead}{abnt}{
\UseTblrTemplate{caption-tag}{default}
\UseTblrTemplate{caption-sep}{default}
\UseTblrTemplate{caption-text}{default}
@@ -167,7 +159,7 @@
\UseTblrTemplate{lasthead-text}{abnt} % add lasthead-text
}
%% redefine middle head title
-\DefTblrTemplate{capcont}{abnt}{
+\DeclareTblrTemplate{capcont}{abnt}{
\UseTblrTemplate{caption-tag}{default}
\UseTblrTemplate{caption-sep}{default}
\UseTblrTemplate{caption-text}{default}
@@ -175,105 +167,25 @@
}
%%% %-------------------------------------------------
-%%> \section{To save ``page span'' status}
-\newif\if at tablularray@abnt at mark@spanpages
+%% To save ``page span'' status
-%%% \AtBeginDocument{%
+\AddToHook{tabularray/table/after}
+{
+ \ifnum\lTblrTablePageInt>1%
+ \immediate\write\@auxout{\gdef\string\tabularray at abnt@tblr at spanpages@\tabularray at abnt@tblr at count@roman{true}}
+%
+ \fi
+}
-%%% % \@tablularray at abnt@mark at spanpagesfalse % initially false
-\global\let\if at tablularray@abnt at mark@spanpages\iffalse
-%%% } % \AtBeginDocument{%
-
-%%% hook tabularray not working as expected. Need more recente version of tabularray?
-%%% \AddToHook{tabularray/table/before}
-%%% {
-
-%%% % \@tablularray at abnt@mark at spanpagestrue
-%%% \global\let\if at tablularray@abnt at mark@spanpages\iftrue
-%%% }
-%%% \AddToHook{tabularray/table/after}
-%%% {
-
-%%%% \@tablularray at abnt@mark at spanpagesfalse
-%%% \global\let\if at tablularray@abnt at mark@spanpages\iffalse
-%%% }
-
-%%% % check page span status for longtblr
-\AddToHook{env/longtblr/after}{ \global\let\if at tablularray@abnt at mark@spanpages\iftrue }
-\AddToHook{env/longtblr/end}{ \global\let\if at tablularray@abnt at mark@spanpages\iffalse }
-
-%%% % check page span status for tblr (with possible long option)
-\AddToHook{env/tblr/after}{ \global\let\if at tablularray@abnt at mark@spanpages\iftrue }
-\AddToHook{env/tblr/end}{ \global\let\if at tablularray@abnt at mark@spanpages\iffalse }
-
-%%% % check page span status for tblr like env
-%%% % Not work as exprected
-%%% \AddToHook{tabularray/table/before}{ \global\let\if at tablularray@abnt at mark@spanpages\iftrue }
-%%% \AddToHook{tabularray/table/after}{ \global\let\if at tablularray@abnt at mark@spanpages\iffalse }
-
-%%% {
-
-
-%%% \AddToHook{env/longtblr/begin}
-%%% {
-
-%%% % \@tablularray at abnt@mark at spanpagestrue
-%%% \global\let\if at tablularray@abnt at mark@spanpages\iftrue
-%%% }
-
-%%% \AddToHook{env/longtblr/end}
-%%% {
-
-%%% \@tablularray at abnt@mark at spanpagesfalse
-%%% \global\let\if at tablularray@abnt at mark@spanpages\iffalse
-%%% }
-
-%%% % For tblr with long opcion
-%%% \AddToHook{env/tblr/begin}
-%%% {
-
-%%% % \@tablularray at abnt@mark at spanpagestrue
-%%% \global\let\if at tablularray@abnt at mark@spanpages\iftrue
-%%% }
-
-%%% \AddToHook{env/tblr/end}
-%%% {
-
-%%% % \@tablularray at abnt@mark at spanpagesfalse
-%%% \global\let\if at tablularray@abnt at mark@spanpages\iffalse
-%% }
-
-%%% talltblr fit in single page (no hook)
-
-%% if change pages, mark as ``span pages'' on aux file
-
-%%% \AddToHook{shipout/after}
-\AddToHook{shipout/after}
-{
- \if at tablularray@abnt at mark@spanpages
- %% to the associated commands act globally
- %% tip from https://tex.stackexchange.com/questions/115932/on-the-basics-of-writing-to-reading-from-auxiliary-files-aux-toc-etc
- \immediate\write\@auxout{\gdef\string\tabularray at abnt@tblr at spanpages@\tabularray at abnt@tblr at count@roman{true}}
-
-%%% \else % DEBUG
-%%% \immediate\write\@auxout{\gdef\string\tabularray at abnt@tblr at spanpages@\tabularray at abnt@tblr at count@roman{false}}
-
-\fi
- %% to the associated commands act globally
- %% tip from https://tex.stackexchange.com/questions/566884/setting-a-newif-to-false-ignored-on-first-check-in-custom-itemize-environment
- \global\let\if at tablularray@abnt at mark@spanpages\iffalse
-
-%%% % DEBUG:
-%%% \immediate\write\@auxout{\gdef\string\tabularray at abnt@shipout at message{DEGUB: page=\thepage, tblrnum=\tabularray at abnt@tblr at count@roman}}
-}
-
+%%> change 'lot' for abntexto (that write on lot file) }
+%%
%% For abntexto class, need change the form to write on ``lot''
%% For others, only add global counter
\if at tabularray@abnt at using@abntexto
\ExplSyntaxOn
- \DefTblrTemplate{caption-lot}{abnt}
+ \DeclareTblrTemplate{caption-lot}{abnt}
{
\tl_if_empty:NTF \lTblrEntryTl
{\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl}
@@ -284,28 +196,15 @@
\addtoext{lot}{lofi}{\protect\lotlabelbox{\thetable}{\l__tblr_caption_short_tl}}
}
\ExplSyntaxOff
-%%%\else% \if at tabularray@abnt at using@abntexto
-%%% \ExplSyntaxOn
-%%% \DefTblrTemplate {caption-lot}{abnt}
-%%% {
-%%%
-%%% %% \stepcounter{tabularray at abnt@global at tblr@counter}% global table/quadro counter
-%%% \tl_if_empty:NTF \lTblrEntryTl
-%%% { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl }
-%%% { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrEntryTl }
-%%% \addcontentsline { lot } { table }
-%%% { \protect\numberline { \thetable } { \l__tblr_caption_short_tl } }
-%%% }
-%%% \ExplSyntaxOff
\fi% \if at tabularray@abnt at using@abntexto
%% Change remark to use for source and note as ABNT
-\DefTblrTemplate{remark-tag}{abnt}{\InsertTblrRemarkTag}
+\DeclareTblrTemplate{remark-tag}{abnt}{\InsertTblrRemarkTag}
%% Change left margin using tip from
%% https://tex.stackexchange.com/questions/645175/how-to-indent-notes-in-tabularray
\newlength\tabularray at abnt@remark at labellength
-\DefTblrTemplate{remark}{abnt}{%
+\DeclareTblrTemplate{remark}{abnt}{%
\MapTblrRemarks{%
\settowidth{\tabularray at abnt@remark at labellength}{\UseTblrTemplate{remark-tag}{abnt}\UseTblrTemplate{remark-sep}{default}}%
\UseTblrTemplate{remark-tag}{abnt}\UseTblrTemplate{remark-sep}{default}%
@@ -362,15 +261,13 @@
\newcommand{\listadequadros}{\notoc\nonum\section{\listquadroname}\makeloq}
\fi
%% Caution: don't put space between braces and parameters
- \DefTblrTemplate{caption-tag}{quadro}{\quadroname\hspace{0.25em}\the\countquadro}
+ \DeclareTblrTemplate{caption-tag}{quadro}{\quadroname\hspace{0.25em}\the\countquadro}
\ExplSyntaxOn
- \DefTblrTemplate{caption-lot}{quadro}
+ \DeclareTblrTemplate{caption-lot}{quadro}
{
-
-%%% \stepcounter{tabularray at abnt@global at tblr@counter}% global table/quadro counter
\addtocounter{table}{-1}%Não contar como table
- %% counter created by \definelegendplace{quadro} is not \c at quadro+, but \countquadro, and is necessary to use TeX command to increase
+ %% counter created by \definelegendplace{quadro} is not \c at quadro, but \countquadro, and is necessary to use TeX command to increase
\global\advance\countquadro by 1% count as ``quadro''
\tl_if_empty:NTF \lTblrEntryTl
{\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl}
@@ -399,18 +296,16 @@
\newcommand{\listadequadros}{\listof{quadro}{\listofquadrosname}}
\newfloat{quadro}{tbp}{loq}%[chapter]
-%%% %\counterwithout{quadro}{chapter} counter not nested frm chapter
+%%% %\counterwithout{quadro}{chapter} counter not nested from chapter
\fi
%%% % We need to use \hspace and \enskip, but not ~ or \space,
%%% % since we want a correct hangindent caption paragraph.
- \DefTblrTemplate{caption-tag}{quadro}{\quadroname\hspace{0.25em}\thequadro}
+ \DeclareTblrTemplate{caption-tag}{quadro}{\quadroname\hspace{0.25em}\thequadro}
\ExplSyntaxOn
- \DefTblrTemplate{caption-lot}{quadro}
- {
-
-%%% \stepcounter{tabularray at abnt@global at tblr@counter}% global table/quadro counter
+ \DeclareTblrTemplate{caption-lot}{quadro}
+ {
\addtocounter{table}{-1}% not count as table
\stepcounter{quadro}% count as quadro
\tl_if_empty:NTF \lTblrEntryTl
@@ -432,7 +327,7 @@
\gdef\@tabularray at abnt@tblr at font{#1}
}
-%%% % New environments for tables
+%% New environments for tables
\NewDocumentEnvironment{abnttblr}{+o +m +b}{
\ifdefined\@tabularray at abnt@tblr at font \@tabularray at abnt@tblr at font \fi
\begin{tblr}[theme=abnt,#1]{#2}
@@ -441,44 +336,18 @@
}{}
\NewDocumentEnvironment{tallabnttblr}{+o +m +b}{
-
-%%% tallabnttblr begin
-%%% \if at tablularray@abnt at mark@spanpages
-%%% DEBUG: mark span pages active
-%%% \fi
-%%% table+quadro counter = \tabularray at abnt@tblr at count@roman
\ifdefined\@tabularray at abnt@tblr at font \@tabularray at abnt@tblr at font \fi
\begin{talltblr}[theme=abnt,#1]{#2}
#3
\end{talltblr}
-
-%%% tallabnttblr end
-%%% \if at tablularray@abnt at mark@spanpages
-%%% DEBUG: mark span pages active
-%%% \fi
-%%% table+quadro counter = \tabularray at abnt@tblr at count@roman
}{}
\NewDocumentEnvironment{longabnttblr}{+o +m +b}{
-
-%%% longabnttblr begin
-%%% \if at tablularray@abnt at mark@spanpages
-%%% DEBUG: mark span pages active
-%%% \fi
-%%% table+quadro counter = \tabularray at abnt@tblr at count@roman
-%%% \global\let\if at tablularray@abnt at mark@spanpages\iftrue
\ifdefined\@tabularray at abnt@tblr at font \@tabularray at abnt@tblr at font \fi
\begin{longtblr}[theme=abnt,#1]{#2}
#3
\end{longtblr}
-%%% \global\let\if at tablularray@abnt at mark@spanpages\iffalse
-
-%%% longabnttblr end
-%%% \if at tablularray@abnt at mark@spanpages
-%%% DEBUG: mark span pages active
-%%% \fi
-%%% table+quadro counter = \tabularray at abnt@tblr at count@roman
}{}
%% end: tabularray-abnt.sty
More information about the tex-live-commits
mailing list.