- Make all packages Expl3.

- Replace ifthen dependency with wrappers for Latex3 conditionals.
- Debug CrossRef and WrapBoxout.
This commit is contained in:
2025-09-18 16:51:12 -05:00
parent 72ab67463b
commit e2a0277635
21 changed files with 278 additions and 183 deletions

View File

@@ -53,12 +53,14 @@
\color{textColor}
\label{box:#2}
\tl_if_empty:nTF {#3} {
% No header
\expanded{\noexpand\begin{tblrBoxout}{\l_Boxout_innerspec_tl}}
\setlength{\parskip}{\medskipamount}
\setlength{\parindent}{0pt}
\__Boxout_format:\ignorespaces#4\\
\end{tblrBoxout}
}{
% Yes header
\expanded{\noexpand\begin{tblrBoxout}{\l_Boxout_innerspec_tl}}
\SetCell{halign=c, font={\sbfamily\bfseries}}{#3}\\
\setlength{\parskip}{\medskipamount}
@@ -167,9 +169,9 @@
\keys_set:nn{WrapBoxout}{#1}
\__WrapFig_process_options:
\dim_compare:nNnTF {\l_WrapBoxout_width_dim} > {\l_WrapBoxout_justifywidth_dim} {
\cs_set:Npn \__WrapBoxout_format: {\justifying}
\cs_set:Nn \__WrapBoxout_format: {\justifying}
} {
\cs_set:Npn \__WrapBoxout_format: {\l_WrapFig_format_tl}
\cs_set:Nn \__WrapBoxout_format: {\l_WrapFig_format_tl}
}
% \message{
% WrapBoxout:~
@@ -181,14 +183,15 @@
hoffset = {\dim_use:N \l_WrapFig_hoffset_dim},
\l_WrapFig_passed_keys_str,
]}
%\begin{minipage}{\l_WrapBoxout_width_dim}
\begin{Boxout}[
innerspec:e = {\l_Boxout_innerspec_tl,columns={\dim_use:N \l_WrapBoxout_width_dim}},
warning:e = \bool_to_str:N \l_Boxout_warning_bool,
format = {\__WrapBoxout_format:}
]{#2}[#3]
#4
\end{Boxout}
%\end{minipage}
\begin{Boxout}[
innerspec:e = {
\l_Boxout_innerspec_tl,
columns={\dim_use:N \l_WrapBoxout_width_dim}
},
warning:e = {\bool_to_str:N \l_Boxout_warning_bool},
format = \__WrapBoxout_format:,
]{#2}[#3]
#4
\end{Boxout}
\end{wrapstuff}
\group_end: }{}