summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty')
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty66
1 files changed, 43 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index 90c44579ae3..6dbae535964 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
@@ -31,6 +31,9 @@
\gdef\upm@date@second#1{{\expandafter\expandafter\expandafter\upm@date@head\expandafter\upm@date@tail#1\expandafter\@nil\expandafter\expandafter\expandafter\@nil}}
\gdef\upm@date@third#1{{\expandafter\expandafter\expandafter\upm@date@tail\expandafter\upm@date@tail#1\expandafter\@nil\expandafter\expandafter\expandafter\@nil}}
+\newif\ifupm@use@override@standard@lists
+\global\upm@use@override@standard@liststrue
+
%----------------------------------------
% LOCALES
%----------------------------------------
@@ -79,6 +82,9 @@
\upm@format@lang@english
\PassOptionsToPackage{english}{varioref}
}
+\DeclareOption{standardlists}{%
+ \global\upm@use@override@standard@listsfalse
+}
\ExecuteOptions{english}
\ProcessOptions
\upm@lang@@
@@ -101,6 +107,7 @@
\RequirePackage{xkeyval}
\RequirePackage{hyphenat}
\RequirePackage{bbm}
+\RequirePackage{environ}% for advanced environment declaration
%----------------------------------------
% Exponent and indice
@@ -1131,33 +1138,46 @@
\end{upm@fmt@enumdescription}%
}
-% Issue #14: enumerate behaves as enumdescription
-\renewenvironment{enumerate}[1][1]{%
- \begin{upm@fmt@enumdescription}{#1}{}{\string.~}{}{\enumdescriptionlabelseparator}{}%
-}
-{%
- \end{upm@fmt@enumdescription}%
-}
+%% Issue #14: enumerate behaves as enumdescription
+\ifupm@use@override@standard@lists
+ \AtBeginDocument{
+ \message{*** Overriding the 'enumerate' environment. Pass option 'standardlists' for avoiding this override.}
+ \global\let\enumerate\@undefined
+ \global\let\endenumerate\@undefined
+ \global\NewEnviron{enumerate}[1][1]{
+ \protect\begin{upm@fmt@enumdescription}{#1}{}{\string.~}{}{\enumdescriptionlabelseparator}{}%
+ \BODY%
+ \protect\end{upm@fmt@enumdescription}%
+ }
+ }
+\fi
%----------------------------------------
% DESCRIPTION LIST WITH BULLETS
%----------------------------------------
-\gdef\upm@fmt@itemizeddescription@separator{\iflanguage{french}{ :}{:}\ }
-\newcommand{\upm@fmt@itemizeddescription@formatdescription}[1]{\textbf{#1}}
-\newcommand{\upm@fmt@itemizeddescription@desc}[2]{%
- \upm@fmt@itemizeddescription@formatdescription{#1#2}%
-}
-\let\upm@fmt@olditem\item
-\let\upm@item@param\upm@fmt@olditem
-\let\upm@item@noparam\upm@fmt@olditem
-\def\item{\@ifnextchar[\upm@item@param\upm@item@noparam}
-\renewenvironment{description}[1][\upm@fmt@itemizeddescription@separator]{%
- \begin{itemize}%
- \renewcommand{\upm@item@param}[1][]{\upm@fmt@olditem \upm@fmt@itemizeddescription@desc{##1}{#1}}%
- \renewcommand{\upm@item@noparam}{\upm@fmt@olditem }%
-}{%
- \end{itemize}%
-}
+\ifupm@use@override@standard@lists
+ \gdef\upm@fmt@itemizeddescription@separator{\iflanguage{french}{ :}{:}\ }
+ \newcommand{\upm@fmt@itemizeddescription@formatdescription}[1]{\textbf{#1}}
+ \newcommand{\upm@fmt@itemizeddescription@desc}[2]{%
+ \upm@fmt@itemizeddescription@formatdescription{#1#2}%
+ }
+ \let\upm@fmt@olditem\item
+ \let\upm@item@param\upm@fmt@olditem
+ \let\upm@item@noparam\upm@fmt@olditem
+ \def\item{\@ifnextchar[\upm@item@param\upm@item@noparam}
+ \AtBeginDocument{
+ \message{*** Overriding the 'description' environment. Pass option 'standardlists' for avoiding this override.}
+ \global\let\description\@undefined
+ \global\let\enddescription\@undefined
+ \global\NewEnviron{description}[1][\upm@fmt@itemizeddescription@separator]{
+ \begin{itemize}%
+ \renewcommand{\upm@item@param}[1][]{\upm@fmt@olditem \upm@fmt@itemizeddescription@desc{##1}{#1}}%
+ \renewcommand{\upm@item@noparam}{\upm@fmt@olditem }%
+ \BODY%
+ \end{itemize}%
+ }
+ }
+\fi
%----------------------------------------
% SIZE MANAGEMENT