texlive[75054] Master/texmf-dist: upmethodology (29apr25)
commits+karl at tug.org
commits+karl at tug.org
Tue Apr 29 21:45:50 CEST 2025
Revision: 75054
https://tug.org/svn/texlive?view=revision&revision=75054
Author: karl
Date: 2025-04-29 21:45:50 +0200 (Tue, 29 Apr 2025)
Log Message:
-----------
upmethodology (29apr25)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
Modified: trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex 2025-04-29 19:45:16 UTC (rev 75053)
+++ trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex 2025-04-29 19:45:50 UTC (rev 75054)
@@ -4,9 +4,7 @@
\declaredocument{\LaTeX\ Packages for Structured Documents as for Unified Process Methodology}{Official Documentation}{UPM-2025-01}
-\updateversion{25.0}{\makedate{06}{04}{2020}}{Add explainations for \texttt{{\textbackslash}Append} and \texttt{{\textbackslash}setdocumentpurpose}.}{\upmpublic}
-\incversion{\makedate{03}{06}{2021}}{Add emphazing box with titles.}{\upmpublic}
-\incversion{\makedate{14}{03}{2025}}{Update the documentation for the \texttt{declareupmtheorem} command and \texttt{definition} environment.}{\upmpublic}
+\updateversion{25.0}{\makedate{14}{03}{2025}}{Update the documentation for the \texttt{declareupmtheorem} command and \texttt{definition} environment.}{\upmpublic}
\incsubversion{\makedate{15}{03}{2025}}{Add the mention of the dependency to \texttt{tobibind} in the dependencies of \texttt{upmmethodology-fmt}.}{\upmpublic}
\incversion{\makedate{15}{03}{2025}}{Add the commands \texttt{{\textbackslash}defref} and \texttt{{\textbackslash}defpageref}.}{\upmpublic}
\incversion{\makedate{15}{03}{2025}}{Add the optional "source text" to the commands \texttt{{\textbackslash}mfigure} and \texttt{{\textbackslash}mfigure*}.}{\upmpublic}
@@ -16,6 +14,10 @@
\incversion{\makedate{06}{04}{2025}}{Add macro \texttt{{\textbackslash}upmcaption}.}{\upmpublic}
\incversion{\makedate{12}{04}{2025}}{Replace \texttt{tabularx} by \texttt{xltabular} and table options \texttt{figurecaptionabove} and \texttt{figurecaptionabove}.}{\upmpublic}
\incversion{\makedate{20}{04}{2025}}{Extend the internal value definition API.}{\upmpublic}
+\incsubversion{\makedate{27}{04}{2025}}{Add option \texttt{pgf} for figure commands.}{\upmpublic}
+\incsubversion{\makedate{27}{04}{2025}}{Include package \texttt{enumitem} for inline enumerations.}{\upmpublic}
+\incsubversion{\makedate{27}{04}{2025}}{Enable multiple lines the column heads with \texttt{{\textbackslash}tabularheader}.}{\upmpublic}
+\incversion{\makedate{29}{04}{2025}}{Add environment \texttt{mlongtable}.}{\upmpublic}
\addauthorvalidator*[galland at arakhne.org]{St{\'e}phane}{Galland}{Original Author}
\addauthor*{Frans}{van Dunn\'e}{Reviewer}
@@ -186,6 +188,7 @@
\item \texttt{amsmath}
\item \texttt{amsthm}
\item \texttt{colortbl}
+\item \texttt{enumitem}
\item \texttt{environ}
\item \texttt{fontawesome5}
\item \texttt{graphicx}
@@ -551,7 +554,13 @@
\begin{itemize}
\item \texttt{position}: is the desired position of the figure (see {\textbackslash}begin\{figure\}[position]). It could be \texttt{t} (top of the page), \texttt{b} (bottom of the page), \texttt{h} (at the command location if possible) or \texttt{H} (at command location);
-\item \texttt{include\_graphics\_options}: are the options passed to \texttt{{\textbackslash}includegraphics};
+\item \texttt{include\_graphics\_options}: are the options passed to graphic inclusion command.
+ These options may be one of the followings:
+ \begin{itemize}
+ \item \texttt{pgf[=true|false]} : if it is evaluated to true, use the PGF commands \texttt{{\textbackslash}pgfdeclareimage} and \texttt{{\textbackslash}pgfuseimage} for including the image; Otherwise use the command \texttt{{\textbackslash}includegraphics} for including the image;
+ \end{itemize}
+ By default, the command \texttt{{\textbackslash}includegraphics} is used.
+ Depending on the use of the previous options, the rest of the options in \texttt{include\_graphics\_options} are those for \texttt{{\textbackslash}includegraphics} or for \texttt{{\textbackslash}pgfdeclareimage};
\item \texttt{filename}: is the filename passed to \texttt{{\textbackslash}includegraphics};
@@ -578,7 +587,7 @@
The reference and page reference are obtained with \texttt{{\textbackslash}figref\{example:mfigure1\}} and \texttt{{\textbackslash}figpageref\{example:mfigure1\}}.
-\mfigure[ht]{width=.4\linewidth}{arakhne_org_logo}{Example of figure inclusion with \texttt{{\textbackslash}mfigure}}{example:mfigure1}
+\mfigure[ht]{pgf,width=.4\linewidth}{arakhne_org_logo}{Example of figure inclusion with \texttt{{\textbackslash}mfigure}}{example:mfigure1}
\subsection{Example with Source Text Only}
@@ -586,7 +595,7 @@
\texttt{{\textbackslash}mfigure[ht]\{width=.4{\textbackslash}linewidth\}\{slogo\}\{Example of figure inclusion with {\textbackslash}texttt\{\{{\textbackslash}textbackslash\}mfigure with source text\}\}\{example:mfigure2\}[This text explain the source]}
-\mfigure[ht]{width=.4\linewidth}{arakhne_org_logo}{Example of figure inclusion with \texttt{{\textbackslash}mfigure with source text}}{example:mfigure2}[This text explain the source]
+\mfigure[ht]{pgf,width=.4\linewidth}{arakhne_org_logo}{Example of figure inclusion with \texttt{{\textbackslash}mfigure with source text}}{example:mfigure2}[This text explain the source]
\subsection{Rendering of the source text}
@@ -633,9 +642,9 @@
The reference and page reference are obtained with \texttt{{\textbackslash}figref\{example:msubfigure\}} and \texttt{{\textbackslash}figpageref\{example:msubfigure\}}.
\begin{mfigures}{Example of subfigures with \texttt{mfigures}}{example:msubfigure}
- \mfigure{width=.4\linewidth}{arakhne_org_logo}{First subfigure}{example:firstsubfigure}
+ \mfigure{pgf,width=.4\linewidth}{arakhne_org_logo}{First subfigure}{example:firstsubfigure}
\hspace{1cm}
- \msubfigure{width=.4\linewidth}{figure_and_tex}{Second subfigure}
+ \msubfigure{pgf,width=.4\linewidth}{figure_and_tex}{Second subfigure}
\end{mfigures}
The references to the subfigures could be obtained in two way:\nopagebreak\begin{itemize}
@@ -652,9 +661,9 @@
\begin{mfigures}{Example of subfigures with \texttt{mfigures} and a figures note}{example:msubfigurewithnote}
\figurenote{This is the text of the note}
- \mfigure{width=.4\linewidth}{arakhne_org_logo}{First subfigure}{example:firstsubfigure}
+ \mfigure{pgf,width=.4\linewidth}{arakhne_org_logo}{First subfigure}{example:firstsubfigure}
\hspace{1cm}
- \msubfigure{width=.4\linewidth}{figure_and_tex}{Second subfigure}
+ \msubfigure{pgf,width=.4\linewidth}{figure_and_tex}{Second subfigure}
\end{mfigures}
@@ -686,9 +695,9 @@
\begin{mfigures}{Example of subfigures with \texttt{mfigures} and a figures source}{example:msubfigurewithsource}
\addsource{This is the text of the source}
- \mfigure{width=.4\linewidth}{arakhne_org_logo}{First subfigure}{example:firstsubfigure}
+ \mfigure{pgf,width=.4\linewidth}{arakhne_org_logo}{First subfigure}{example:firstsubfigure}
\hspace{1cm}
- \msubfigure{width=.4\linewidth}{figure_and_tex}{Second subfigure}
+ \msubfigure{pgf,width=.4\linewidth}{figure_and_tex}{Second subfigure}
\end{mfigures}
\begin{upmcaution}
@@ -788,10 +797,30 @@
\section{Tabulars}
\label{section:mtabular}
-You could include a tabular inside your document with the following environment.
+You could include a tabular (nor not-floating table) inside your document with the following environment.
+The UPmethodology provides two types of tabular environments: regular tabular, long tabular and table.
+Table \tabref{tabulartablecomparison} provides a brief comparison of these three concepts, that are detailed in sections \ref{section:regulartabular}, \ref{section:longtabular} and \ref{section:mtable}, respectivelly.
-\paragraph{Syntax} \texttt{{\textbackslash}begin\{mtabular\}[width]\{ncolumns\}\{columns\}...{\textbackslash}end\{mtabular\}}
+\begin{mtable}{\linewidth}{4}{l|X|X|X}{Comparison of the concepts of regular tabular, long tabular and table}{tabulartablecomparison}
+ \tabularheader{Criterion}{Regular Tabular}{Long Tabular}{Table}
+ Purpose & Creating the structure of a table & Same as regular tabular & Used as a floating container for tabular material \\
+ \hline
+ Floating Behavior & No & No & Yes \\
+ \hline
+ Placement Control & Where the tabular is written & Where the tabular is written & \LaTeX\ decides according to provided position modifiers \\
+ \hline
+ Multiple pages & No & Yes & No \\
+ \hline
+\end{mtable}
+\subsection{Regular Tabular}
+\label{section:regulartabular}
+
+The regular tabular is designed to create tables by organizing data into rows and columns.
+According to Table \tabref{tabulartablecomparison}, a regular tabular cannot cover multiple pages.
+
+\paragraph{Syntax} \texttt{{\textbackslash}begin\{mtabular\}[width]\{ncolumns\}\{columns\}\{top title\}...{\textbackslash}end\{mtabular\}}
+
This tabular is an extension of the \texttt{xltabular} environment which provides dynamic columns with the specifier \texttt{X}, mixing the \texttt{lontable} and \texttt{tabularx} standard packages. The parameters are:
\begin{itemize}
\item \texttt{width}: is the desired width of the tabular;
@@ -798,8 +827,17 @@
\item \texttt{ncolumns}: is the count of columns in the tabular. It must be consistent with the column description;
-\item \texttt{columns}: is the description of the columns according to the \texttt{tabular} and \texttt{tabularx} or \texttt{xltabular} packages.
+\item \texttt{columns}: is the description of the columns according to the \texttt{tabular} and \texttt{tabularx} or \texttt{xltabular} packages. The following characters are supported for representing a single column :
+ \begin{itemize}
+ \item \texttt{l}: the column is left aligned with a width that is corresponding to the maximum width of the column's content;
+ \item \texttt{r}: the column is right aligned with a width that is corresponding to the maximum width of the column's content;
+ \item \texttt{c}: the column is centered with a width that is corresponding to the maximum width of the column's content;
+ \item \texttt{p\{w\}}: the column is centered with a width equals to \texttt{w};
+ \item \texttt{X}: the column is centered with a width computed by \LaTeX.
+ \end{itemize}
+\item \texttt{top title}: is the text to be drawn as a title at the top of the table. This top title is not a caption, according to the definition of a caption in a table.
+
\end{itemize}
\begin{upmcaution}
@@ -818,10 +856,11 @@
\item \texttt{{\textbackslash}tabularheader\{$header_1$\}...\{$header_n$\}} \\
This command allows you to define the titles of the columns. It uses the colors \texttt{tableheaderbackground} and \texttt{tableheaderforeground} for the background and the foreground respectively. Because the count of columns was given to the environment this function takes the same count of parameters as the count of columns. This command adds a line after the header, \emph{BUT NOT BEFORE}.
-\begin{upmcaution}
- Because \texttt{{\textbackslash}tabularheader} is adding a \texttt{{\textbackslash}hline} at the end of its expansion. You must put a \texttt{{\textbackslash}tabularheader} just after \texttt{{\textbackslash}tabularheader}. Otherwise you may obtain a \TeX\ error.
-\end{upmcaution}
+\begin{upmnote}
+ The header text $header_1$ to $header_n$ ould have multiple lines. It is allowed to use the command \texttt{{\textbackslash}{\textbackslash}} to add a line in the column's title.
+\end{upmnote}
+
\item \texttt{{\textbackslash}tabularrowheader\{title\}} \\
This command is designed to be used in the first cell of a row. It is rendering the cell as a row's header. A row header is a cell that is an header for the row. Only the row header cell has the header background color.
@@ -837,7 +876,7 @@
The following example of table is obtained by: \\
\begin{verbatim}
-\begin{mtabular}[\linewidth]{4}{lXrX}
+\begin{mtabular}[\linewidth]{4}{lXrX}{}
\tabularheader{Col1}{Col2}{Col3}{Col4}
a & b & c & d \\
\hline
@@ -862,11 +901,17 @@
m & n & o & p \\
\end{mtabular}
-Long tables are assumed to be on multiple pages.
-The \texttt{mtabular} environment supports long tables.
-An example of a long table could be found below.
+\subsection{Long Tabular}
+\label{section:longtabular}
-\begin{mtabular}[\linewidth]{2}{|l|X|}{This is the long table title}
+Long tables could be rendered on multiple pages, according to Table \tabref{tabulartablecomparison}, page \tabpageref{tabulartablecomparison}.
+The \texttt{mlongtabular} environment supports long tables.
+
+\paragraph{Syntax} \texttt{{\textbackslash}begin\{mlongtabular\}[width]\{ncolumns\}\{columns\}\{top title\}...{\textbackslash}end\{mlongtabular\}}
+
+\paragraph{Example} An example of a long table could be found below.
+
+\begin{mlongtabular}[\linewidth]{2}{|l|X|}{This is the long table title}
\tabularheader{Col1}{Col2}
1 & 0 \\
2 & 0 \\
@@ -936,13 +981,16 @@
67 & 6 \\
68 & 6 \\
68 & 6 \\
-\end{mtabular}
+\end{mlongtabular}
\section{Tables}
+\label{section:mtable}
You could include a table inside your document with the following environment: \\
\texttt{{\textbackslash}begin\{mtable\}[options]\{width\}\{ncolumns\}\{columns\}\{caption\}\{label\}...{\textbackslash}end\{mtable\}} \\
+According to Table \tabref{tabulartablecomparison}, page \tabpageref{tabulartablecomparison}, a table is a floating structure that contains data formatted in rows and columns.
+
This environment is based on the \texttt{mtabular} environment (see Section \ref{section:mtabular}). The parameters are:
\begin{itemize}
\item \texttt{options}: are the options to pass to the \texttt{mtable} environment: \begin{itemize}
@@ -1133,8 +1181,32 @@
In several document, an enumeration of things is written inside a paragraph instead of inside a list of points.
+\subsubsection{Standard inline enumeration from \texttt{enumitem}}
+
+The UPmethodology package includes the package \texttt{enumitem} with the \texttt{inline} option.
+Therefore, it is possible to obtain an inline (or horizontal) enumeration.
+
\paragraph{Example:} The following \LaTeX~code produces the result below:
\begin{verbatim}
+This is a text: \begin{enumerate*}
+\item first thing;
+\item second thing;
+\item etc.
+\end{enumerate*} This is the text after.
+\end{verbatim}
+
+This is a text: \begin{enumerate*}
+\item first thing;
+\item second thing;
+\item etc.
+\end{enumerate*} This is the text after.
+
+\subsubsection{Shortcut inline enumeration}
+
+The environment \texttt{inlineenumeration} is a shortcut to \texttt{enumerate*} with the options \texttt{label={\textbackslash}textit{({\textbackslash}roman*)},ref={\textbackslash}textit{({\textbackslash}roman*)}}.
+
+\paragraph{Example:} The following \LaTeX~code produces the result below:
+\begin{verbatim}
This is a text: \begin{inlineenumeration}
\item first thing;
\item second thing;
@@ -1148,6 +1220,7 @@
\item etc.
\end{inlineenumeration} This is the text after.
+
\section{Environment \texttt{description}}
The environment \texttt{description} is redefined as following.
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def 2025-04-29 19:45:16 UTC (rev 75053)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def 2025-04-29 19:45:50 UTC (rev 75054)
@@ -1 +1 @@
-\def\UPMVERSION{20250425}
+\def\UPMVERSION{20250429}
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty 2025-04-29 19:45:16 UTC (rev 75053)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty 2025-04-29 19:45:50 UTC (rev 75054)
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm at package@fmt at ver{2025/04/23}
+\global\edef\upm at package@fmt at ver{2025/04/29}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-fmt}[\upm at package@fmt at ver]
@@ -135,8 +135,9 @@
\RequirePackage{tikz}
\RequirePackage{fontawesome5}
\RequirePackage{tocbibind} % To automatically the common "Listof" in the outline
+\RequirePackage[inline]{enumitem}
+\RequirePackage[usestackEOL]{stackengine}
-
%----------------------------------------
% Exponent and indice
%----------------------------------------
@@ -252,6 +253,49 @@
}
%----------------------------------------
+% INTERNAL BUFFERING OF FIGURES
+%----------------------------------------
+
+\define at boolkey[upm at fmt]{includegraphics}[upm at fmt@mfigure at internal@is]{pgf}[true]{}
+
+\newcount\upm at fmt@mfigure at internal@includegraphics at index
+\upm at fmt@mfigure at internal@includegraphics at index=1
+
+% Include graphics or its previously loaded buffer
+% #1: options for graphic loading
+% #2: filename of the figure
+\newcommand{\upm at fmt@mfigure at internal@includegraphics}[2]{%
+ % Treat local options
+ \setkeys*[upm at fmt]{includegraphics}{#1}%
+ % Expand the remaining xkeyval options for both image loading functions
+ \protected at xdef\upm at fmt@mfigure at internal@includegraphics at invokea{\XKV at rm}%
+ \protected at xdef\upm at fmt@mfigure at internal@includegraphics at invokeb{upm at includegraphics@\the\upm at fmt@mfigure at internal@includegraphics at index}%
+ \protected at xdef\upm at fmt@mfigure at internal@includegraphics at invokec{\protect\includegraphics[\upm at fmt@mfigure at internal@includegraphics at invokea]{#2}}%
+ \protected at xdef\upm at fmt@mfigure at internal@includegraphics at invoked{%
+ \protect\pgfdeclareimage%
+ [\upm at fmt@mfigure at internal@includegraphics at invokea]%
+ {\upm at fmt@mfigure at internal@includegraphics at invokeb}%
+ {#2}%
+ }%
+ % Do the loading depending on the driver
+ \ifupm at fmt@mfigure at internal@ispgf%
+ \@ifundefined{upm at fmt@mfigure at internal@pfg@#2}{%
+ \upm at fmt@mfigure at internal@includegraphics at invoked%
+ \expandafter\protected at xdef\csname upm at fmt@mfigure at internal@pfg@#2\endcsname{
+ \protect\pgfuseimage%
+ {\upm at fmt@mfigure at internal@includegraphics at invokeb}%
+ }%
+ }{%
+ %\show\upm at fmt@mfigure at internal@includegraphics at invokeb%
+ }%
+ \@nameuse{upm at fmt@mfigure at internal@pfg@#2}%
+ \global\advance\upm at fmt@mfigure at internal@includegraphics at index by 1\relax%
+ \else%
+ \upm at fmt@mfigure at internal@includegraphics at invokec%
+ \fi%
+}
+
+%----------------------------------------
% FIGURES
%----------------------------------------
@@ -262,7 +306,7 @@
\protect\upm at caption{#4}{}{#6}%
\protect\label{fig:#5}%
\fi%
- \protect\includegraphics[#2]{#3}%
+ \protect\upm at fmt@mfigure at internal@includegraphics{#2}{#3}%
\ifupm at fmt@figure at topcaption\else%
\protect\upm at caption{#4}{}{#6}%
\protect\label{fig:#5}%
@@ -351,7 +395,7 @@
\subcaptionbox{##4%
\label{fig:##5}%
\label{fig:#4:\upm at tmp@subfigure at label}%
- }{\includegraphics[##2]{##3}}%
+ }{\upm at fmt@mfigure at internal@includegraphics{##2}{##3}}%
\addtocounter{upm at subfigure@count}{1}%
}
%options,filename,caption
@@ -359,7 +403,7 @@
\xdef\upm at tmp@subfigure at label{\alph{upm at subfigure@count}}%
\subcaptionbox{##3%
\label{fig:#4:\upm at tmp@subfigure at label}%
- }{\includegraphics[##1]{##2}}%
+ }{\upm at fmt@mfigure at internal@includegraphics{##1}{##2}}%
\addtocounter{upm at subfigure@count}{1}%
}
\newcommand{\figurenote}[1]{\gdef\upm at figure@note{\upm at float@formatexplanation{\bgroup \ignorespaces ##1\egroup}}}%
@@ -561,7 +605,6 @@
\tcbset{
mtabular*/.style 2 args={%
- breakable,%
enhanced,%
attach title,%
colbacktitle=tableheaderbackground,%
@@ -592,7 +635,7 @@
\newcommand{\tabularheaderstyle}[1]{%
\mbox{}{\cellcolor{tableheaderbackground} {\color{tableheaderforeground}\itshape\ignorespaces#1}}%
}%
-\def\upm at fmt@table at column@title#1{\hfil{\color{tableheaderforeground} \cellcolor{tableheaderbackground} {\itshape#1}}\hfil}
+\def\upm at fmt@table at column@title#1{\hfil{\color{tableheaderforeground} \cellcolor{tableheaderbackground} {\itshape\raisebox{-.5\height}{\addstackgap{\shortstack{#1}}}}}\hfil}
% Utility functions for mtabular
\newcounter{upm at fmt@mtabular at columnnumber}
@@ -608,8 +651,8 @@
}
%-----
-%\mtabular[width]{ncolumns}{columns}{table title}
-\global\NewEnviron{mtabular}[4][\linewidth]{%
+%\upm at fmt@mtabular at expandtabular{width}{ncolumns}{columns}{table title}{options for tcolorbox environment}{tabular content}
+\newcommand{\upm at fmt@mtabular at expandtabular}[6]{%
\newcommand*{\upm at fmt@mtabular at column@next}[1]{%
& \upm at fmt@table at column@title{\ignorespaces##1\ignorespaces}%
\addtocounter{upm at fmt@mtabular at columnnumber}{-1}%
@@ -645,16 +688,28 @@
\newcommand{\tabularrowheader}[1]{%
\centering\upm at fmt@table at column@title{\ignorespaces##1}%
}%
- \begin{tcolorbox}[mtabular={#3},title={#4}]%
+ \begin{tcolorbox}[mtabular={#3},title={#4},#5]%
\let\tcb at CT@arc at save\CT at arc@%
\arrayrulecolor{tcbcolframe}\def\arraystretch{1.1}%
\tcb at hack@currenvir\begin{xltabular}{\linewidth}{#3}%
- \BODY%
+ #6%
\end{xltabular}%
\global\let\CT at arc@\tcb at CT@arc at save%
\end{tcolorbox}%
}
+%-----
+%\mtabular[width]{ncolumns}{columns}{table title}
+\global\NewEnviron{mtabular}[4][\linewidth]{%
+ \expandafter\upm at fmt@mtabular at expandtabular{#1}{#2}{#3}{#4}{}{\BODY}%
+}
+
+%-----
+%\mlongtabular[width]{ncolumns}{columns}{table title}
+\global\NewEnviron{mlongtabular}[4][\linewidth]{%
+ \expandafter\upm at fmt@mtabular at expandtabular{#1}{#2}{#3}{#4}{breakable}{\BODY}%
+}
+
\gdef\upm at table@source{}
%-----
@@ -1426,17 +1481,10 @@
% INLINE ENUMERATION
%----------------------------------------
-\newcounter{@@upm at fmt@inlineenumeration}
-\newcommand{\inlineenumerationlabel}[1]{\textit{(#1)}}
-\let\upm at fmt@inlineenum at numberformat\roman
-\newenvironment{inlineenumeration}{%
- \begingroup%
- \let\upm at fmt@inlineenum at currentlabel\@currentlabel%
- \renewcommand{\item}{\xdef\@currentlabel{\upm at fmt@inlineenum at numberformat{@@upm at fmt@inlineenumeration}}{\inlineenumerationlabel{\@currentlabel}{\addtocounter{@@upm at fmt@inlineenumeration}{1}}}~}%
- \setcounter{@@upm at fmt@inlineenumeration}{1}%
-}{%
- \global\let\@currentlabel\upm at fmt@inlineenum at currentlabel%
- \endgroup%
+\NewEnviron{inlineenumeration}[1][label=\textit{(\roman*)},ref=\textit{(\roman*)}]{%
+ \begin{enumerate*}[#1]%
+ \BODY%
+ \end{enumerate*}%
}
%----------------------------------------
More information about the tex-live-commits
mailing list.