summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-10-07 03:03:15 +0000
committerNorbert Preining <norbert@preining.info>2022-10-07 03:03:15 +0000
commitbbbfa0a90645d4da46b1492f6513b28a01eb78da (patch)
treedcbf82e9f2bd50ac7596114690ad31ca7a6dbf8c /macros/latex/contrib
parent678708e90ffe138885ed8c06b6780d491b80fae5 (diff)
CTAN sync 202210070303
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/abntexto/README4
-rw-r--r--macros/latex/contrib/abntexto/abntexto-manual.pdfbin134196 -> 144264 bytes
-rw-r--r--macros/latex/contrib/abntexto/abntexto-manual.tex106
-rw-r--r--macros/latex/contrib/abntexto/abntexto.bib36
-rw-r--r--macros/latex/contrib/abntexto/abntexto.cls177
-rw-r--r--macros/latex/contrib/coolfn/README15
-rw-r--r--macros/latex/contrib/coolfn/coolfn.sty100
-rw-r--r--macros/latex/contrib/coolfn/coolfndocumentation.pdfbin0 -> 67039 bytes
-rw-r--r--macros/latex/contrib/coolfn/coolfndocumentation.tex179
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin511473 -> 511095 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex5
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.dtx84
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin1325255 -> 1324298 bytes
13 files changed, 502 insertions, 204 deletions
diff --git a/macros/latex/contrib/abntexto/README b/macros/latex/contrib/abntexto/README
index 48f906c50f..c726532934 100644
--- a/macros/latex/contrib/abntexto/README
+++ b/macros/latex/contrib/abntexto/README
@@ -1,6 +1,6 @@
Public Domain Software
-2022-09-29
-1.1.0-alpha
+2022-10-06
+1.2.0-alpha
Elayson
abntexto dot classe at gmail dot com
diff --git a/macros/latex/contrib/abntexto/abntexto-manual.pdf b/macros/latex/contrib/abntexto/abntexto-manual.pdf
index a2282e2fd7..1756b85168 100644
--- a/macros/latex/contrib/abntexto/abntexto-manual.pdf
+++ b/macros/latex/contrib/abntexto/abntexto-manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/abntexto/abntexto-manual.tex b/macros/latex/contrib/abntexto/abntexto-manual.tex
index 20ecc91f12..d054cf73fc 100644
--- a/macros/latex/contrib/abntexto/abntexto-manual.tex
+++ b/macros/latex/contrib/abntexto/abntexto-manual.tex
@@ -4,11 +4,11 @@
\usepackage[brazil]{babel}
\usepackage[T1]{fontenc}
-\usepackage[scale=0.85]{inconsolata}
-\usepackage[matchlowercase]{tgheros} \def\familydefault{\sfdefault}
+\usepackage{tgheros} \def\familydefault{\sfdefault}
+\usepackage{inconsolata}
\usepackage{lipsum} \def\lip{\lipsum[1][1-2]}
\usepackage{graphicx}
-\usepackage{xcolor}
+\usepackage[cmyk]{xcolor}
\usepackage[style=abnt]{biblatex} \addbibresource{abntexto.bib}
\usepackage[colorlinks]{hyperref}
%\let\href=\relax
@@ -40,24 +40,31 @@
\def\adef#1{\catcode`#1=13 \begingroup \lccode`\~=`#1\lowercase{\endgroup\def~}}
\def\dodef#1{\catcode`#1=12 }
-\def\verbcatcodes{\let\do=\dodef \dospecials \catcode`\%=14 \catcode`\|=0 }
+\def\verbcatcodes{\let\do=\dodef \dospecials \catcode`\|=0 }
-\long\def\verbon{\par\begingroup \verbcatcodes\obeyspaces
- \adef\^^I{\space\space\space}%
- \adef\^^M{\par\leavevmode}%
+{\catcode`\^^M=13
+ \gdef\verbpercent#1^^M{{\bfseries\color{graycomment}\@percentchar#1^^M}}
+}
+
+\long\def\codeon{\par\begingroup \verbcatcodes
+ \adef{\^^I}{\ \ \ }%
+ \adef{\^^M}{\par\leavevmode}%
+ \adef{ }{\ }%
+ \adef{\%}{\verbpercent}%
\startverb
}
-{\catcode`\|=0 \catcode`\\=12
- |gdef|startverb#1\verboff{|verbbox{#1}|par|endgroup |verbreset}
+{\catcode`\ =13 \catcode`\^^M=13 \catcode`\|=0 \catcode`\\=12
+ |gdef|startverb^^M#1^^M\codeoff{|verbbox{#1}|par|endgroup |verbreset}
}
\def\verbbox#1{\def\tnba@placewidth{\hsize \advance\hsize-3cm}%
- \ifx\tnba@savedplace\empty\else\vskip\placeabovespace\fi
+ \vskip\placeabovespace
\parindent=0pt
\ifx\tnba@savedplace\empty\else\tnba@makelegend\fi
\nobreak\nointerlineskip\vskip10pt
{\verbfont{#1}}%
\nobreak\nointerlineskip\vskip8pt
- \ifx\tnba@savedsrc\empty\else\tnba@makesrc\vskip\placebelowspace\fi
+ \ifx\tnba@savedsrc\empty\else\tnba@makesrc\fi
+ \vskip\placebelowspace
}
\def\verbreset{%
\let\tnba@savedplace=\empty
@@ -65,7 +72,7 @@
\let\tnba@savedsrc=\empty
\let\@currentlabel=\empty
}
-\def\verbfont{\raggedright\leftskip=6pt\singlesp\ttnoligs\leftframed}
+\def\verbfont{\raggedright\leftskip=6pt\singlesp\small\ttnoligs\leftframed}
\long\def\leftframed#1{\setbox0=\vtop{#1}%
\hbox{{\color{graybar}\kern1.5cm\vrule width1pt}\box0}%
}
@@ -78,10 +85,10 @@
\sizeselectordef\LARGE{25pt}{30pt}
\definecolor{graybar}{gray}{0.75}
-\definecolor{graycomment}{gray}{0.55}
-
-\legendplacedef{verb}{Verbatim}{verb.\,#1}{lov}
+\definecolor{graycomment}{gray}{1}
+\legendplacedef{code}{Código}{Lista de códigos}{cód.\,#1}{loc}
+\def\loclabelwidth{10.6ex}
\def\me{o autor.}
\tocilowercase
@@ -91,7 +98,13 @@
\widowpenalty=10000
\let\cite=\textcite
-\def\appendixlabelwidth{7em}
+\def\appendixlabelwidth{7.2em}
+
+\def\bibfont{\singlesp}
+\bibitemsep=18pt
+
+\def\corrprinton{\begingroup \def\section##1##2{\heading{##2}}}
+\def\corrprintoff{\par\endgroup}
\makeatother
@@ -110,7 +123,7 @@
\vskip3in
-{\centering \large\ttfamily 1.1.0-alpha\par}
+{\centering \large\ttfamily 1.2.0-alpha\par}
\newpage
@@ -132,20 +145,20 @@ As normas ABNT as quais o \pkg{abntexto} se propõe a seguir são aquelas em vig
Digite as linhas em \ref{vb:início} e use \pkg{abntexto}.
-\legend{verb}{Início} \src\me
+\legend{code}{Início} \src\me
\label{vb:início}
-\verbon
+\codeon
\documentclass{abntexto}
-\usepackage[brazil]{babel} |% para obter os padrões de hifenização corretos
+\usepackage[brazil]{babel} % para obter os padrões de hifenização corretos
\usepackage[T1]{fontenc}
-\usepackage{newtxtext} |% fontes New TX, com estilo times
+\usepackage{newtxtext} % fontes New TX, semelhante a Times
\usepackage{newtxmath}
\begin{document}
Texto
-\end{document}%
-\verboff
+\end{document}
+\codeoff
\section{Fonte tipográfica}
@@ -163,9 +176,9 @@ Além das chaves anteriores também existe \cs{twoside} que é booleana, ou seja
Os comandos que mudam a fonte das entradas no ToC (Table of Contents, em inglês) são \cs\tocifont, \cs\tociifont, \dots, \cs\tocvfont\ (ver \ref{vb:contents}).
-\legend{verb}{Aparência do sumário} \src\me
+\legend{code}{Aparência do sumário} \src\me
\label{vb:contents}
-\verbon
+\codeon
\documentclass{abntexto}
\usepackage{color}
@@ -178,18 +191,18 @@ Os comandos que mudam a fonte das entradas no ToC (Table of Contents, em inglês
\section{Título}
\subsection{Título}
-\end{document}%
-\verboff
+\end{document}
+\codeoff
\section{Secionamento}
A personalização das macros de seção (\cs\section, \cs\subsection\ etc.) é análoga a personalização do sumário e deve ser feita com \cs\sectionfont, \cs\subsectionfont, etc. como exemplificado em \ref{vb:sec}.
-Também há como alterar o espaço vertical acima e abaixo das seções usando \cs\sectionspaces, \cs\subsectionspaces, etc. Por exemplo, \cs\sectionspaces\ccval{2ex}\ccval{1cm} insere um espaço de 2ex acima de \cs\section\ e 1cm abaixo.
+Também há como alterar o espaço vertical acima e abaixo das seções usando \cs\sectionspaces, \cs\subsectionspaces, etc. Por exemplo, \cs\sectionspaces\ccval{2ex}\ccval{1cm} insere um espaço de 2\,ex acima de \cs\section\ e de 1\,cm abaixo.
-\legend{verb}{Aparência das seções} \src\me
+\legend{code}{Aparência das seções} \src\me
\label{vb:sec}
-\verbon
+\codeon
\documentclass{abntexto}
\usepackage{color}
@@ -204,16 +217,16 @@ Também há como alterar o espaço vertical acima e abaixo das seções usando \
\section{Texto}
\subsection{Texto}
\subsubsection{Texto}
-\end{document}%
-\verboff
+\end{document}
+\codeoff
\section{Alíneas}
Use o ambiente \cs{topics} para criar alíneas. Ele dispõe de dois níveis sendo que o segundo usa um travessão como marcador conforme o exemplo em \ref{vb:topics}. Naturalmente o uso de \cs\label\ é permitido.
-\legend{verb}{Alíneas} \src\me
+\legend{code}{Alíneas} \src\me
\label{vb:topics}
-\verbon
+\codeon
\begin{topics}
\item \label{al:x} 1
\begin{topics}
@@ -223,16 +236,16 @@ Use o ambiente \cs{topics} para criar alíneas. Ele dispõe de dois níveis send
\end{topics}
\item \label{al:y} 2
\item 3
-\end{topics}%
-\verboff
+\end{topics}
+\codeoff
\section{Áreas de legenda}
Use \cs\place\ para inserir áreas de legenda como mostrado em \ref{vb:place}. Mas existem condições: \cs\place\ deve vir por último e \cs\label\ precisa estar depois de \cs\legend. Além disso, existe a possibilidade de alterar o espaço vertical acima e abaixo de uma área de legenda com \cs\placespaces\cc{aboveskip}\cc{belowskip}.
-\legend{verb}{Áreas de legenda} \src\me
+\legend{code}{Áreas de legenda} \src\me
\label{vb:place}
-\verbon
+\codeon
\usepackage{graphicx}
\begin{document}
@@ -242,8 +255,10 @@ Use \cs\place\ para inserir áreas de legenda como mostrado em \ref{vb:place}. M
\place{\includegraphics[width=0.4\linewidth]{example-image}}
Ver \ref{fig:teste}.
-\end{document}%
-\verboff
+\end{document}
+\codeoff
+
+O leitor pode querer definir uma nova área de legenda usando, por exemplo: \cs\legendplacedef\ccval{diagram}\ccval{Diagrama}\ccval{Lista de diagramas}\ccval{diag.\cs\,\cs#1}\ccval{lod} que vai criar o comando \cs\makelod\ para escrever no documento as entradas do arquivo auxiliar .lod.
\section{Formatação de {\ttfamily\protect\textbackslash cite} e referências}
@@ -255,8 +270,9 @@ Para inserir aspas em citações diretas use \cs\qt\ccval{texto}. Mas, se tratan
\newpage
-{\def\section#1#2{\heading{#2}}%
- \printbibliography\par}
+\corrprinton
+\printbibliography
+\corrprintoff
\newpage
\appendix
@@ -265,4 +281,8 @@ Para inserir aspas em citações diretas use \cs\qt\ccval{texto}. Mas, se tratan
Em progresso\dots
-\end{document}
+\section{\emph{Feedback}}
+
+Sugestões, \emph{bug reports} e doações são bem-vindas.
+
+\end{document}
diff --git a/macros/latex/contrib/abntexto/abntexto.bib b/macros/latex/contrib/abntexto/abntexto.bib
index 84b0e4d98d..6604bc3f5b 100644
--- a/macros/latex/contrib/abntexto/abntexto.bib
+++ b/macros/latex/contrib/abntexto/abntexto.bib
@@ -1,25 +1,25 @@
@book{texbytopic,
-author = {Viktor Eijkhout},
-title = {\TeX\ by topic: a \TeX nician’s reference},
-location = {England},
-publisher = {Addison-Wesley},
-date = {1992},
-url = {https://www.ctan.org/pkg/texbytopic},
-urldate = {2022-09-28}
+ author = {Viktor Eijkhout},
+ title = {\TeX\ by topic: a \TeX nician’s reference},
+ location = {England},
+ publisher = {Addison-Wesley},
+ date = {1992},
+ url = {https://www.ctan.org/pkg/texbytopic},
+ urldate = {2022-09-28}
}
@book{viaexemplos,
-author = {Sadao Massago},
-title = {\LaTeXe\ Via Exemplos},
-location = {São Paulo},
-date = {2022-05-17},
-url = {https://www.ctan.org/pkg/latex-via-exemplos},
-urldate = {2022-09-28}
+ author = {Sadao Massago},
+ title = {\LaTeXe\ Via Exemplos},
+ location = {São Paulo},
+ date = {2022-05-17},
+ url = {https://www.ctan.org/pkg/latex-via-exemplos},
+ urldate = {2022-09-28}
}
@book{latex2eunnoficial,
-author = {Torsten Martinsen and Stephen Gilmore and Karl Berry},
-title = {\LaTeXe: An unofficial reference manual},
-date = {2022-05},
-url = {https://www.ctan.org/pkg/latex2e-help-texinfo},
-urldate = {2022-09-28}
+ author = {Torsten Martinsen and Stephen Gilmore and Karl Berry},
+ title = {\LaTeXe: An unofficial reference manual},
+ date = {2022-05},
+ url = {https://www.ctan.org/pkg/latex2e-help-texinfo},
+ urldate = {2022-09-28}
}
diff --git a/macros/latex/contrib/abntexto/abntexto.cls b/macros/latex/contrib/abntexto/abntexto.cls
index 9fa14dca86..aa12bb3eb8 100644
--- a/macros/latex/contrib/abntexto/abntexto.cls
+++ b/macros/latex/contrib/abntexto/abntexto.cls
@@ -1,25 +1,9 @@
%! Public Domain Software
-%! 2022-09-29
-%! 1.1.0-alpha
+%! 2022-10-06
+%! 1.2.0-alpha
%! Elayson
%! abntexto dot classe at gmail dot com
-% ANNOUNCEMENT
-
-% The implementation of legend areas has been improved.
-
-% Inclusion of the \appendix and \annex macros.
-
-% Removal of \noprotrusion and \extfile macros.
-
-% Better compatibility with the hyperref package.
-
-% The functionality of topics has been improved.
-
-% Footnotes have been adjusted according to the Standard.
-
-% Additions to the manual.
-
%! SUMÁRIO
%! PRÉ-CONFIGURAÇÕES
@@ -34,23 +18,23 @@
%! NOTAS DE RODAPÉ
%! UTILIDADES
%! IDENTIFICAÇÃO DO TRABALHO
-%! PATCHS, HOOKS
+%! A VÍRGULA COMO SEPARADOR DECIMAL
%! INICIALIZAÇÃO
-% |sec PRÉ-CONFIGURAÇÕES
+% \sec PRÉ-CONFIGURAÇÕES
% !=======================================================
-% Identificação do formato |TeX| e da classe. Apenas o pacote |pkg keyval | é carregado no |pkg abntexto .
+% Identificação do formato \TeX\ e da classe. Apenas o pacote \pkg{keyval} é carregado no \pkg{abntexto}.
% |bcode !------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{abntexto}[2022-09-29 1.1.0-alpha Preparation of works in ABNT standards]
+\ProvidesClass{abntexto}[2022-10-06 1.2.0-alpha Preparation of works in ABNT standards]
\RequirePackage{keyval}
% |ecode !------------------------------------------------
-% Definição do sistema |emph chave|eq%valor | e de um comando de |emph debug .
+% Definição do sistema \emph{chave=valor} e de um comando de \emph{debug}. Perceba que \tnba@bodyhook não pode ser igual a \cs\relax, mas \cs\empty ao invés.
% |bcode !------------------------------------------------
\def\tnba@keyprefix{tnba}
@@ -61,18 +45,20 @@
\def\advancecount#1{\global\advance#1by1 }
\def\tnba@addto#1#2{\expandafter\def\expandafter#1\expandafter{#1#2}}
-\def\tnba@tobdocument{\tnba@addto\tnba@bdocumenthook}
+\def\tnba@tobody{\tnba@addto\tnba@bodyhook}
-\let\tnba@bdocumenthook=\empty
-\AddToHook{begindocument}{\def\tnba@inbody{}\tnba@bdocumenthook}
+\let\tnba@bodyhook=\empty
+\AddToHook{begindocument}{\def\tnba@body{}\tnba@bodyhook}
\def\tnba@error{\ClassError{abntexto}}
% |ecode !------------------------------------------------
-% |sec FONTE TIPOGRÁFICA
+% \sec FONTE TIPOGRÁFICA
% !=======================================================
-% Apenas o tamanho 12|,pt está definido. Defina outros usando |cs fontsizedef |metac size |metac defs .
+% Apenas o tamanho 12\,pt está definido. Defina outros usando \cs\fontsizedef\cc{size}\cc{defs}.
+
+% Diferentemente de outras âncoras, \cs{\tnba@setfontsizehook} deve ser executado antes de \cs\begin\ccval{document} para evitar o alerta sobre \cs\normalsize\ não estar definido.
% |bcode !------------------------------------------------
\def\fontsizedef#1#2{\@namedef{tnba@fontsize@#1}{#2}}
@@ -86,20 +72,19 @@
\AddToHook{begindocument/before}{\tnba@setfontsizehook}
-\def\spacing#1{\ifx\tnba@inbody\undefined
- \def\tnba@spacinghook{\tnba@spacing{#1}} \else
- \tnba@spacing{#1}\fi \ignorespaces
+\def\spacing#1{\def\currspacing{#1}%
+ \ifx\tnba@body\undefined
+ \tnba@tobody{\tnba@spacing{#1}} \else
+ \tnba@spacing{#1}\fi \ignorespaces
}
-\def\tnba@spacing#1{\dimen0=\f@size pt \dimen0=#1\dimen0 \baselineskip=\dimen0 }
+\def\tnba@spacing#1{\dimen0=\f@size pt \dimen0=#1\dimen0 \baselineskip=\dimen0}
\def\singlesp{\baselineskip=\normalbaselineskip}
\def\onehalfsp{\spacing{1.5}}
\def\doublesp{\spacing{2}}
-
-\AddToHook{begindocument}{\csname tnba@spacinghook\endcsname}
% |ecode !------------------------------------------------
-% |sec |emph LAYOUT
+% \sec \emph{LAYOUT}
% !=======================================================
% |bcode !------------------------------------------------
@@ -129,8 +114,9 @@
\headsep=1cm
\advance\topmargin-\headheight \advance\topmargin-\headsep
\advance\textwidth-\tnba@L \advance\textwidth-\tnba@R
- \advance\textheight-\tnba@T \advance\textheight-\tnba@B
- \advance\headsep-\fontcharht\font`1
+ \advance\textheight-\tnba@T \advance\textheight-\tnba@B
+ \setbox0=\hbox{\@setfontsize\@tempa{10}{12pt}\@tempa 1}
+ \advance\headsep-\ht0
\ifx\pdfpagewidth\undefined
\ifx\pagewidth\undefined
\tnba@error{O comando \@backslashchar paper só suporta saída em PDF. Use o formato PDF ou carregue o pacote *geometry*}\expandafter\enddocument\relax \else
@@ -174,7 +160,7 @@
}
% |ecode !------------------------------------------------
-% |sec SUMÁRIO
+% \sec SUMÁRIO
% !=======================================================
% |bcode !------------------------------------------------
@@ -183,7 +169,7 @@
\def\extline#1#2#3#4{%
\begingroup
\csname use#1\romannumeral#2font\endcsname \nobreak
- \extlineshape
+ \extlineshape \relax
\hskip-\leftskip {#3}\nobreak
\leaders\hbox{$\m@th \mkern4.5mu\hbox{.}\mkern4.5mu$}\hfil\nobreak
\hbox to1.55em{\hss #4\kern-1pt\kern1pt}\par
@@ -201,7 +187,7 @@
\def\l@section#1#2{\smartaboveskip{\penalty351}{\vskip1em plus1pt}%
\begingroup
\usetocifont \nobreak
- \extlineshape
+ \extlineshape \relax
\hskip-\leftskip \maybeuctoc{#1}\nobreak\hfil\nobreak
\hbox to1.55em{\hss #2\kern-1pt\kern1pt}\par
\endgroup
@@ -218,7 +204,7 @@
\def\tocvfont#1{\def\usetocvfont{#1}}
% |ecode !------------------------------------------------
-% |sec SECIONAMENTO
+% \sec SECIONAMENTO
% !=======================================================
% |bcode !------------------------------------------------
@@ -315,7 +301,7 @@
\def\hreftocline#1{\Hy@MakeCurrentHrefAuto{#1}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
}
-\tnba@tobdocument{\ifx\hypertarget\undefined \let\hreftocline=\@gobble \fi}
+\tnba@tobody{\ifx\hypertarget\undefined \let\hreftocline=\@gobble \fi}
% |ecode !------------------------------------------------
% |bcode !------------------------------------------------
@@ -346,44 +332,44 @@
\def\appendixlabelwidth{8em}
\def\annexlabelwidth{6.2em}
-\def\l@appendix{%
- \let\extlabelwidth=\appendixlabelwidth
+\def\l@appendix{\let\extlabelwidth=\appendixlabelwidth
\def\extlabelbox##1{\hbox to\extlabelwidth{Apêndice~##1~---~\hfil}}%
\l@section
}
-\def\l@annex{%
- \let\extlabelwidth=\annexlabelwidth
+\def\l@annex{\let\extlabelwidth=\annexlabelwidth
\def\extlabelbox##1{\hbox to\extlabelwidth{Anexo~##1~---~\hfil}}%
\l@section
}
-\def\appendix{\def\section##1{\noindent \advance\appendixcount by1
+\def\appendix{\def\section##1{\newpage\noindent \advance\appendixcount by1
{\usesectionfont \centering \maybeucsec{Apêndice~\theappendix~---~##1}\tnba@nbpar}%
- \addcontentsline{toc}{appendix}{\protect\extlabelbox{\theappendix}##1}%
- \nobreak \vskip\sectionbelow
+ \hreftocline{appendix}%
+ \addcontentsline{toc}{appendix}{\protect\extlabelbox{\theappendix}##1}%
+ \nobreak \vskip\sectionbelow
}%
}
-\def\annex{\def\section##1{\noindent \advance\annexcount by1
+\def\annex{\def\section##1{\newpage\noindent \advance\annexcount by1
{\usesectionfont \centering \maybeucsec{Anexo~\theannex~---~##1}\tnba@nbpar}%
- \addcontentsline{toc}{annex}{\protect\extlabelbox{\theannex}##1}%
- \nobreak \vskip\sectionbelow
+ \hreftocline{annex}%
+ \addcontentsline{toc}{annex}{\protect\extlabelbox{\theannex}##1}%
+ \nobreak \vskip\sectionbelow
}%
}
% |ecode !------------------------------------------------
-% |sec CITAÇÕES
+% \sec CITAÇÕES
% !=======================================================
% |bcode !------------------------------------------------
\def\qt#1{``#1''}
\def\quote#1{\smartaboveskip{\penalty351}{\vskip\baselineskip}%
- \hbox to\hsize{\hfil\vtop{\advance\hsize-4cm \noindent\small #1\getprev}}\useprev
+ \hbox to\hsize{\hfil\vtop{\advance\hsize-4cm \noindent\small #1\tnba@getprevdepth}}\tnba@useprevdepth
\smartbelowskip{\vskip\baselineskip}%
}
% |ecode !------------------------------------------------
-% |sec ALÍNEAS
+% \sec ALÍNEAS
% !=======================================================
% |bcode !------------------------------------------------
@@ -409,38 +395,32 @@
\let\endtopics=\par
% |ecode !------------------------------------------------
-% |sec TABELAS
+% \sec TABELAS
% !=======================================================
% |bcode !------------------------------------------------
\newenvironment{table}[1]{\begin{tabular}{#1}}{\end{tabular}}
% |ecode !------------------------------------------------
-% |sec ÁREAS DE LEGENDA
+% \sec ÁREAS DE LEGENDA
% !=======================================================
% |bcode !------------------------------------------------
-%\long\def\@makecaption#1#2{\sbox0{#1~—~#2}%
-% \ifdim\wd0>\hsize
-% #1~—~#2\par \else
-% \global\@minipagefalse \hbox to\hsize{\hss\box0\hss}%
-% \fi
-% \vskip10pt
-%}
-%\def\place#1#2#3{\@float{#1}\centering\caption{#2}#3\end@float}
-
\def\tnba@lastplacenum{0}
-% \legendplacedef{<type>}{<name>}{<ref-font>}{<file-extension>}
-\def\legendplacedef#1#2#3#4{\expandafter\newcount\csname c@#1\endcsname
+\def\legendplacedef#1#2#3#4#5{\expandafter\newcount\csname c@#1\endcsname
\@namedef{#1name}{#2}
- \@namedef{p@#1}##1{#3}
- \@namedef{ext@#1}{#4}
- \@namedef{l@#1}{\extline{#4}{1}}
+ \@namedef{p@#1}##1{#4}
+ \@namedef{ext@#1}{#5}
+ \@namedef{l@#1}{\extline{#5}{1}}
\expandafter\edef\csname the#1\endcsname{\expandafter\noexpand\the\csname c@#1\endcsname}
-% \tnba@key{pos}{\@namedef{fps@#1}{##1}}
-% \@nameedef{ftype@#1}{\the\numexpr\tnba@lastplacenum+1}
-% \@namedef{fnum@#1}{\csname #1name\endcsname ~\csname the#1\csname}
+ \@namedef{#5labelwidth}{10.4ex}
+ \@namedef{#5labelbox}##1{\hbox to\extlabelwidth{#2 ##1 ---\hfil}}
+ \@namedef{make#5}{\heading{#3}%
+ \expandafter\let\expandafter\extlabelwidth\csname #5labelwidth\endcsname
+ \expandafter\let\expandafter\extlabelbox\csname #5labelbox\endcsname
+ \@starttoc{#5}\twonewpage
+ }
}
% |ecode !------------------------------------------------
@@ -457,9 +437,9 @@
{\protect\extlabelbox\thelegend \tnba@savedlegend}%
}
-\def\tnba@makesrc{\hbox to\hsize{\hfil\tnba@makesrcA\hfil}\useprev}
+\def\tnba@makesrc{\hbox to\hsize{\hfil\tnba@makesrcA\hfil}\tnba@useprevdepth}
\def\tnba@makesrcA{\vtop{\hsize=\tnba@placewidth \srclabel
- \vtop{\setbox0=\hbox{\srclabel}\advance\hsize-\wd0 \tnba@savedsrc \getprev}}%
+ \vtop{\setbox0=\hbox{\srclabel}\advance\hsize-\wd0 \tnba@savedsrc \tnba@getprevdepth}}%
}
% |ecode !------------------------------------------------
@@ -508,7 +488,7 @@
\def\placespaces#1#2{\def\placeabovespace{#1}\def\placebelowspace{#2}}
% |ecode !------------------------------------------------
-% |sec NOTAS DE RODAPÉ
+% \sec NOTAS DE RODAPÉ
% !=======================================================
% As notas de rodapé também foram modificadas.
@@ -521,14 +501,14 @@
\def\footnoterule{\kern18pt\hrule width5cm\kern2.6pt}
% |ecode !------------------------------------------------
-% |sec UTILIDADES
+% \sec UTILIDADES
% !=======================================================
% |bcode !------------------------------------------------
-\def\getprev{\par\xdef\tnba@getprevA{\the\prevdepth}}
-\def\useprev{\par\prevdepth=\tnba@getprevA}
+\def\tnba@getprevdepth{\par\xdef\tnba@getprevdepthA{\the\prevdepth}}
+\def\tnba@useprevdepth{\par\prevdepth=\tnba@getprevdepthA}
-\long\def\sizedpar#1{\leavevmode\vtop{\ignorespaces#1\getprev}\useprev}
+\long\def\sizedpar#1{\leavevmode\vtop{\ignorespaces#1\tnba@getprevdepth}\tnba@useprevdepth}
\def\justifying{\let\\=\tnba@origcr
\leftskip=0pt \rightskip=0pt
@@ -543,17 +523,10 @@
\def\twonewpage{\newpage\leavevmode\newpage}
% |ecode !------------------------------------------------
-% |sec IDENTIFICAÇÃO DO TRABALHO
+% \sec IDENTIFICAÇÃO DO TRABALHO
% !=======================================================
% |bcode !------------------------------------------------
-%\long\def\indexcarddebug#1{\hbox{\vrule\vbox to7.5cm{\hsize=\hsize %\advance\hsize-2cm \advance\hsize-0.8pt
-% \hrule\indexcardA{#1}\vss\indexcardbar\hrule}\vrule}%
-%}
-%\long\def\indexcarddebugA#1{\hbox spread2cm{\hss\vrule
-% \vbox spread2cm{\hrule\vss#1\vss\hrule}\vrule\hss}%
-%}
-
\long\def\indexcard#1{\hbox{\vrule\vbox to7.5cm{\hsize=12.5cm \advance\hsize by-2cm \advance\hsize by-0.8pt
\hrule\indexcardA{#1}\vss\indexcardbar\hrule}\vrule}%
}
@@ -564,16 +537,16 @@
\def\judgeline#1{\par{\centering \rule{.7\linewidth}{.6pt}\\ #1\Enter[1.5]}}
% |ecode !------------------------------------------------
-% |sec A VÍRGULA COMO SEPARADOR DECIMAL
+% \sec A VÍRGULA COMO SEPARADOR DECIMAL
% !=======================================================
% |bcode !------------------------------------------------
{\catcode`,=\active
- \gdef,{\futurelet\next\tnba@smartcomma}
+ \gdef,{\futurelet\let@token\tnba@smartcomma}
}
\def\tnba@smartcomma{%
- \ifx\next\@sptoken \else
- \ifx\next\space \else \mathord \fi\fi
+ \ifx\let@token\@sptoken \else
+ \ifx\let@token\space \else \mathord \fi\fi
\tnba@mathcomma
}
@@ -590,7 +563,7 @@
\fi
% |ecode !------------------------------------------------
-% |sec INICIALIZAÇÃO
+% \sec INICIALIZAÇÃO
% !=======================================================
% |bcode !------------------------------------------------
@@ -635,8 +608,8 @@
\paragraphspaces {\baselineskip}{\baselineskip}
\subparagraphspaces {\baselineskip}{\baselineskip}
-\legendplacedef{figure}{Figura}{fig.\,#1}{lof}
-\legendplacedef{table}{Tabela}{tab.\,#1}{lot}
+\legendplacedef{figure}{Figura}{Lista de figuras}{fig.\,#1}{lof}
+\legendplacedef{table}{Tabela}{Lista de tabelas}{tab.\,#1}{lot}
\def\legendlabel{\legendname ~\thelegend ~---~}
\def\srclabel{\raggedright\small Fonte:~}
@@ -644,16 +617,6 @@
\placespaces{\baselineskip}{\baselineskip}
-\def\makelof{\heading{Lista de figuras}
- \def\extlabelwidth{12.5ex}%
- \def\extlabelbox##1{\hbox to\extlabelwidth{Figura ##1 ---\hfil}}%
- \@starttoc{lof}\twonewpage
-}
-\def\makelot{\heading{Lista de tabelas}
- \def\extlabelwidth{12.5ex}%
- \def\extlabelbox##1{\hbox to\extlabelwidth{Tabela ##1 ---\hfil}}%
- \@starttoc{lot}\twonewpage
-}
\def\maketoc{\heading{Sumário}
\def\extlabelwidth{4ex}%
\def\extlabelbox##1{\hbox to\extlabelwidth{##1\hfil}}%
@@ -666,7 +629,7 @@
\topskip=12pt
-\pretextual
+\AddToHook{begindocument}{\pretextual}
\endinput
% |ecode !------------------------------------------------
diff --git a/macros/latex/contrib/coolfn/README b/macros/latex/contrib/coolfn/README
new file mode 100644
index 0000000000..9b6beb43e2
--- /dev/null
+++ b/macros/latex/contrib/coolfn/README
@@ -0,0 +1,15 @@
+coolfn - a package for cool footnotes
+
+version: 1.0.0
+
+This package provides formatting for footnotes in long legal documents, using hanging indents to make them look nicer
+
+This work may be distributed and/or modified under the conditions of the
+LaTeX Project Public License (LPPL), version 1.3 or later.
+
+
+For suggestions, feature requests, and bug reports, please use the project's
+GitHub site: https://github.com/ezgranet/coolfn
+
+Version history:
+06/10/2022 Package creation \ No newline at end of file
diff --git a/macros/latex/contrib/coolfn/coolfn.sty b/macros/latex/contrib/coolfn/coolfn.sty
new file mode 100644
index 0000000000..af3ee854a2
--- /dev/null
+++ b/macros/latex/contrib/coolfn/coolfn.sty
@@ -0,0 +1,100 @@
+\def\coolfnversionnumber{1.0.0}
+\ProvidesPackage{coolfn}
+[2022/10/06\coolfnversionnumber\
+ A cool way to format footnotes]
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Elijah Z Granet
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% FOOTNOTES
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% from https://tex.stackexchange.com/questions/305033/is-there-a-latex-package-that-defines-an-environment-for-parskip-like-capabiliti
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\makeatletter
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% multi paragraph footnotes
+% are inherently pretty bad
+% but they happen in law
+% so might as well deal with them? so a slight spacing to compensate
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newenvironment{Parskip}{%
+ \par
+ \parskip=0.25\baselineskip \advance\parskip by 0pt plus 1pt
+ \parindent=\z@
+ \def\@listI{\leftmargin\leftmargini
+ \topsep\z@ \parsep\parskip \itemsep\z@}
+ \let\@listi\@listI
+ \@listi
+ \def\@listii{\leftmargin\leftmarginii
+ \labelwidth\leftmarginii\advance\labelwidth-\labelsep
+ \topsep\z@ \parsep\parskip \itemsep\z@}
+ \def\@listiii{\leftmargin\leftmarginiii
+ \labelwidth\leftmarginiii\advance\labelwidth-\labelsep
+ \topsep\z@ \parsep\parskip \itemsep\z@}
+ \partopsep=\z@
+}{\par}
+\makeatother
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand{\fnindent}{1em}
+\usepackage{calc}% for maths
+\newlength{\lengtha}
+\setlength{\lengtha}{\textwidth}
+\newlength{\lengthb}%maths again
+\newlength{\lengthc}
+\setlength{\lengthc}{\fnindent}
+\setlength{\lengthb}{1.75\lengthc}%parblock
+\makeatletter
+\@ifclassloaded{memoir}{}{\usepackage{hanging}}
+\makeatother
+ % for hanging paragraphs
+\renewcommand\footnoterule{}
+% ^ no one wants a rule sep for FN!
+\AtBeginDocument{\flushbottom}
+%^just to be safe
+\makeatletter
+\long\def\@makefntext#1{\leavevmode
+ \@makefnmark\nobreak
+ #1%
+}
+\makeatother
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% the magic
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\makeatletter
+ \renewcommand{\@makefntext}[1]{%
+\begin{minipage}[t]{\lengthb}%
+\noindent\normalfont%
+\@thefnmark%
+\end{minipage}%
+\begin{minipage}[t]{\lengtha-\lengthb}%
+\begin{Parskip}\begin{hangparas}{\lengthc}{1}
+\noindent#1\end{hangparas}\end{Parskip}%
+\end{minipage}%
+}
+\makeatother
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/macros/latex/contrib/coolfn/coolfndocumentation.pdf b/macros/latex/contrib/coolfn/coolfndocumentation.pdf
new file mode 100644
index 0000000000..768c97fe7d
--- /dev/null
+++ b/macros/latex/contrib/coolfn/coolfndocumentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/coolfn/coolfndocumentation.tex b/macros/latex/contrib/coolfn/coolfndocumentation.tex
new file mode 100644
index 0000000000..2d72b17ec8
--- /dev/null
+++ b/macros/latex/contrib/coolfn/coolfndocumentation.tex
@@ -0,0 +1,179 @@
+\documentclass[12pt]{article}
+\usepackage{coolfn}
+\usepackage{textcsc}
+\usepackage{xcolor}
+\usepackage{fontspec}\definecolor{darkspringgreen}{rgb}{0.09, 0.45, 0.27}
+\usepackage{titlesec}
+\titleformat{\subsection}
+ {\bfseries}{\thesection.\thesubsection}{1em}{\normalfont\bfseries}
+\usepackage[hidelinks]{hyperref}
+\usepackage{hologo}
+\usepackage[british]{babel}
+\usepackage[useregional]{datetime2}
+\DTMlangsetup[en-GB]{ord=omit}
+\definecolor{LightGray}{gray}{0.9}
+%\usepackage{mathpazo}
+\IfFontExistsTF{Palatine Parliamentary}{%
+\setromanfont[SmallCapsFeatures={LetterSpace=10},
+RawFeature={+calt,+hlig,+liga,+dlig,+onum,+pnum},
+BoldFont={Palatine Parliamentary Bold},
+ItalicFont={Palatine Parliamentary Italic}
+]{Palatine Parliamentary Regular}
+}{\setromanfont[RawFeature={+onum,+pnum}]{TeX Gyre PagellaX}}
+\setmonofont[Scale=.9,BoldFont=Source Code Pro Bold]{Source Code Pro}
+
+\usepackage{minted}
+\date{6 October 2022\\\smallskip\ttfamily Version \coolfnversionnumber}
+\author{Elijah Z Granet\thanks{e-mail: \href{mailto:ezg21@cantab.ac.uk}{\ttfamily ezg21@cantab.ac.uk}}}
+
+\title{\texttt{coolfn}:\\A package for a cool way to typeset footnotes}
+\begin{document}
+\maketitle
+\tableofcontents
+\clearpage
+\section{Overview}
+Legal writing, for better or for worse,\footnote{Almost certainly for the worse, except in the very rare situations where the author is capable of mastering the art of distinctive discursive footnote writing. Far more authors think that they can pull off this delicate technique than \textit{actually} are capable of doing so. } often involves very long and discursive footnotes replete with a series of often doubtfully relevant citations (perhaps with blockquotes of even more doubtful relevance).\footnote{Here, it is apt to note, as Parke \textcsc{B} said in Parke B in \textit{Mirehouse v Rennel} (1833) 1 Cl \& F 527, 546, that:
+\begin{quote}
+Our common law system consists in the applying to new combinations of circumstances those rules of law which we derive from legal principles and judicial precedents; and for the sake of attaining uniformity, consistency and certainty, we must apply those rules, where they are not plainly unreasonable or inconvenient, to all cases which arise; and we are not at liberty to reject them, and to abandon all analogy to them, in those to which they have not yet been judicially applied, because we think that the rules are not as convenient and reasonable as we ourselves could have devised.\end{quote}} Consequently, the formatting of footnotes for clear numbering, delineation of internal quotations and paragraphs, and clarity takes on a great importance.
+
+This is a subjective question, on which the typographic authorities offer many suggestions. This package simply provides a way of formatting long footnotes the author thinks is, for lack of a better word, cool. It uses a clear column of numbers separated from the footnote, of sufficient width to accommodate triple digit footnote numbers. A hanging indent emphasises the footnote as the sideways mirror of the text, reflecting the paragraph but in a different way.\footnote{Think of the classic mirroring of the main text having the case name and the footnote the legal citation.} There is no footnote rule and a very slight increase in the parskip to help the eye distinguish multi-paragraph footnotes.\footnote{Which are usually a bad idea, but should at least look nice if they must be used.}
+\section{Usage}
+The package has no options, and the only configurable length is the \\\mintinline{latex}{\fnindent}, which sets the indent for the hanging footnotes, and also defines the relationship of the footnote number and main footnote blocks. By default, this is set to 1 \textcsc{M}, but can be easily changed by using the simple inbuilt \LaTeX renewal macro. For example:
+\begin{quote}
+ \mintinline{latex}{\renewcommand{\fnindent}{1.25em}}.
+\end{quote}
+\section{Development}
+Bugs, feature requests, \textit{etc}, should be submitted to the project's official Githup page: (\url{https://github.com/ezgranet/coolfn/}).
+
+\section{Licence}
+ This project is licensed under the Latex Public Project Licence version 1.3\textit{c}. This documentation is copyright of the author but licensed under \textcsc{CC-BY-SA} 3.0.
+
+\clearpage
+\section{Implementation}
+\begin{minted}[
+framesep=2mm,
+baselinestretch=1.2,
+bgcolor=LightGray,
+fontsize=\footnotesize,
+breaklines,
+firstnumber=last
+]
+{latex}
+
+\def\coolfnversionnumber{1.0.0}
+\ProvidesPackage{coolfn}
+[2022/10/06\coolfnversionnumber\
+ A cool way to format footnotes]
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Elijah Z Granet
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% FOOTNOTES
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% from https://tex.stackexchange.com/questions/305033/is-there-a-latex-package-that-defines-an-environment-for-parskip-like-capabiliti
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\makeatletter
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% multi paragraph footnotes
+% are inherently pretty bad
+% but they happen in law
+% so might as well deal with them? so a slight spacing to compensate
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newenvironment{Parskip}{%
+ \par
+ \parskip=0.25\baselineskip \advance\parskip by 0pt plus 1pt
+ \parindent=\z@
+ \def\@listI{\leftmargin\leftmargini
+ \topsep\z@ \parsep\parskip \itemsep\z@}
+ \let\@listi\@listI
+ \@listi
+ \def\@listii{\leftmargin\leftmarginii
+ \labelwidth\leftmarginii\advance\labelwidth-\labelsep
+ \topsep\z@ \parsep\parskip \itemsep\z@}
+ \def\@listiii{\leftmargin\leftmarginiii
+ \labelwidth\leftmarginiii\advance\labelwidth-\labelsep
+ \topsep\z@ \parsep\parskip \itemsep\z@}
+ \partopsep=\z@
+}{\par}
+\makeatother
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand{\fnindent}{1em}
+\usepackage{calc}% for maths
+\newlength{\lengtha}
+\setlength{\lengtha}{\textwidth}
+\newlength{\lengthb}%maths again
+\newlength{\lengthc}
+\setlength{\lengthc}{\fnindent}
+\setlength{\lengthb}{1.75\lengthc}%parblock
+\makeatletter
+\@ifclassloaded{memoir}{}{\usepackage{hanging}}
+\makeatother
+ % for hanging paragraphs
+\renewcommand\footnoterule{}
+% ^ no one wants a rule sep for FN!
+\AtBeginDocument{\flushbottom}
+%^just to be safe
+\makeatletter
+\long\def\@makefntext#1{\leavevmode
+ \@makefnmark\nobreak
+ #1%
+}
+\makeatother
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% the magic
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\makeatletter
+ \renewcommand{\@makefntext}[1]{%
+\begin{minipage}[t]{\lengthb}%
+\noindent\normalfont%
+\@thefnmark%
+\end{minipage}%
+\begin{minipage}[t]{\lengtha-\lengthb}%
+\begin{Parskip}\begin{hangparas}{\lengthc}{1}
+\noindent#1\end{hangparas}\end{Parskip}%
+\end{minipage}%
+}
+\makeatother
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\end{minted}
+
+
+
+
+
+
+
+
+\section{Version History}
+\subsection{\texttt{1.0.0}}
+
+\ttfamily 6 October 2022: Package creation
+
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index 0ae8f26c90..4dfeea879f 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index f7fa1fe561..352fb51efb 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -4983,6 +4983,11 @@ doit être chargé avant le |\documentclass|:
\end{Verbatim}
\medskip
+L'extension \pkg{nicematrix} n'est pas parfaitement compatible avec la classe
+\cls{ltjarticle}: la détection des coins vides (cf. p.~\pageref{corners}) risque
+d'être erronée dans certaines circonstances.
+
+\medskip
L'extension \pkg{nicematrix} n'est pas parfaitement compatible avec l'extension
\pkg{arydshln} (parce que cette extension redéfinit de nombreuses commandes
internes de \pkg{array}). De toutes manières, dans le cadre de \pkg{nicematrix},
diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx
index 659e7fa56a..ed200cd901 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix.dtx
@@ -17,8 +17,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.13a}
-\def\myfiledate{2022/09/17}
+\def\myfileversion{6.13b}
+\def\myfiledate{2022/10/06}
%
%
%<*batchfile>
@@ -4910,6 +4910,11 @@ version 2005/12/01 or later.
% \end{Verbatim}
%
% \bigskip
+% The package \pkg{nicematrix} is not fully compatible with the class
+% \cls{ltjarticle}: the detection of the empty corners (cf.
+% p.~\pageref{corners}) may be wrong.
+%
+% \bigskip
% The package \pkg{nicematrix} is not fully compatible with the package
% \pkg{arydshln} (because this package redefines many internal of \pkg{array}).
% By any means, in the context of \pkg{nicematrix}, it's recommended to draw
@@ -5949,9 +5954,12 @@ version 2005/12/01 or later.
% \begin{macrocode}
\@@_msg_new:nn { Internal~error }
{
- A~fatal~internal~error~have~occurred.\\
- If~you~see~this~message,~contact~the~author~of~the~package~'nicematrix'~
- because~this~error~should~not~have~occurred.
+ Potential~problem~when~using~nicematrix.\\
+ The~package~nicematrix~have~detected~a~modification~of~the~
+ standard~environment~{array}~(of~the~package~array).~Maybe~you~will~encounter~
+ some~slight~problems~when~using~nicematrix.~If~you~don't~want~to~see~
+ this~message~again,~load~nicematrix~with:~\token_to_str:N
+ \usepackage[no-test-for-array]{nicematrix}.
}
% \end{macrocode}
%
@@ -5970,7 +5978,7 @@ version 2005/12/01 or later.
{
\peek_meaning:NTF \ignorespaces
{ \@@_security_test_i:w }
- { \@@_fatal:n { Internal~error } }
+ { \@@_error:n { Internal~error } }
#1
}
% \end{macrocode}
@@ -5979,7 +5987,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_security_test_i:w \ignorespaces #1
{
- \peek_meaning:NF \unskip { \@@_fatal:n { Internal~error } }
+ \peek_meaning:NF \unskip { \@@_error:n { Internal~error } }
#1
}
% \end{macrocode}
@@ -5992,11 +6000,16 @@ version 2005/12/01 or later.
\@ifpackageloaded { mdwtab }
{ \@@_fatal:n { mdwtab~loaded } }
{
- \hbox_set:Nn \l_tmpa_box
+ \bool_if:NF \c_@@_no_test_for_array_bool
{
- \begin { tabular } { c > { \@@_security_test:n } c c }
- text & & text
- \end { tabular }
+ \group_begin:
+ \hbox_set:Nn \l_tmpa_box
+ {
+ \begin { tabular } { c > { \@@_security_test:n } c c }
+ text & & text
+ \end { tabular }
+ }
+ \group_end:
}
}
}
@@ -6420,7 +6433,7 @@ version 2005/12/01 or later.
\tl_set_rescan:Nno
#1
{
- \char_set_catcode_other:N >
+ \char_set_catcode_other:N >_
\char_set_catcode_other:N <
}
#1
@@ -8428,16 +8441,6 @@ version 2005/12/01 or later.
\bool_if:NT \l_@@_small_bool \scriptstyle
}
% \end{macrocode}
-%
-% \bigskip
-% For unexplained reason, with XeTeX (and not with the other engines), the
-% environments of \pkg{nicematrix} were all composed in black and do not take
-% into account the color of the encompassing text. As a workaround, you peek the
-% color in force at the beginning of the environment and we use it now (in each
-% cell of the array).
-% \begin{macrocode}
- \color { nicematrix }
-% \end{macrocode}
%
% \begin{macrocode}
\g_@@_row_style_tl
@@ -8657,7 +8660,14 @@ version 2005/12/01 or later.
\pgfnode
{ rectangle }
{ base }
- { \box_use_drop:N \l_@@_cell_box }
+ {
+% \end{macrocode}
+% The following instruction |\set@color| has been added on 2022/10/06. It's
+% necessary only with XeLaTeX and not with the other engines (we don't know why).
+% \begin{macrocode}
+ \set@color
+ \box_use_drop:N \l_@@_cell_box
+ }
{ \@@_env: - \int_use:N \c@iRow - \int_use:N \c@jCol }
{ }
\str_if_empty:NF \l_@@_name_str
@@ -8955,13 +8965,6 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_pre_array_ii:
{
% \end{macrocode}
-% For unexplained reason, with XeTeX (and not with the other engines), the
-% environments of \pkg{nicematrix} were all composed in black and do not take
-% into account the color of the encompassing text. As a workaround, you peek the
-% color in force at the beginning of the environment and we will use it in each cell.
-% \begin{macrocode}
- \xglobal \colorlet { nicematrix } { . }
-% \end{macrocode}
% The number of letters |X| in the preamble of the array.
% \begin{macrocode}
\int_gzero:N \g_@@_total_X_weight_int
@@ -14459,7 +14462,6 @@ version 2005/12/01 or later.
}
}
% \end{macrocode}
-% Enf of |\AddToHook|.
%
% \medskip
% \begin{macrocode}
@@ -17670,15 +17672,26 @@ version 2005/12/01 or later.
{ \seq_put_right:Nn \l_@@_tikz_seq { { #1 } } }
{ \@@_error:n { tikz~key~without~tikz } } ,
tikz .value_required:n = true ,
- fill .tl_set:N = \l_@@_fill_tl ,
+ fill .code:n =
+ \tl_set_rescan:Nnn
+ \l_@@_fill_tl
+ { \char_set_catcode_other:N ! }
+ { #1 } ,
fill .value_required:n = true ,
- draw .tl_set:N = \l_@@_draw_tl ,
+ draw .code:n =
+ \tl_set_rescan:Nnn
+ \l_@@_draw_tl
+ { \char_set_catcode_other:N ! }
+ { #1 } ,
draw .default:n = default ,
rounded-corners .dim_set:N = \l_@@_rounded_corners_dim ,
rounded-corners .default:n = 4 pt ,
color .code:n =
\@@_color:n { #1 }
- \tl_set:Nn \l_@@_draw_tl { #1 } ,
+ \tl_set_rescan:Nnn
+ \l_@@_draw_tl
+ { \char_set_catcode_other:N ! }
+ { #1 } ,
color .value_required:n = true ,
borders .clist_set:N = \l_@@_borders_clist ,
borders .value_required:n = true ,
@@ -19961,6 +19974,7 @@ version 2005/12/01 or later.
footnote,~
footnotehyper,~
messages-for-Overleaf,~
+ no-test-for-array,~
renew-dots,~and
renew-matrix.
}
@@ -19977,6 +19991,8 @@ version 2005/12/01 or later.
messages-for-Overleaf .bool_set:N = \c_@@_messages_for_Overleaf_bool ,
footnote .bool_set:N = \c_@@_footnote_bool ,
footnotehyper .bool_set:N = \c_@@_footnotehyper_bool ,
+ no-test-for-array .bool_set:N = \c_@@_no_test_for_array_bool ,
+ no-test-for-array .default:n = true ,
unknown .code:n = \@@_error:n { Unknown~key~for~package }
}
\ProcessKeysOptions { NiceMatrix / Package }
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index d2b0a1ca61..bae5622a6d 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ