upmethodology (20jun14)

git-svn-id: svn://tug.org/texlive/trunk@34381 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 80 insertions, 49 deletions

diff --git a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
index ab8cd08397b..2827dd2f1ea 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
+++ b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
index bdbe73ba2d0..d409444b37a 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
+++ b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
@@ -26,6 +26,7 @@
 \incsubversion{\makedate{16}{10}{2013}}{Add the section about the environment \texttt{description}.}{\upmpublic}
 \incsubversion{\makedate{14}{12}{2013}}{Add the section about \texttt{backcovermessage}.}{\upmpublic}
 \incsubversion{\makedate{09}{02}{2014}}{Add the section about \texttt{enumerate}. Typos are fixed.}{\upmpublic}
+\incsubversion{\makedate{20}{06}{2014}}{Add the class option \texttt{standardlists}. Add the dependency to \texttt{environ}.}{\upmpublic}
 
 \addauthorvalidator*[galland@arakhne.org]{St{\'e}phane}{Galland}{Original Author}
 \addauthor*{Frans}{van Dunn\'e}{Reviewer}
@@ -135,8 +136,8 @@ This section contains the list of all the package dependencies for the \texttt{u
 
 \texttt{upmethodology-backpage} package depends on:
 \begin{itemize}
-\item \texttt{upmethodology-p-common}
 \item \texttt{upmethodology-extension}
+\item \texttt{upmethodology-p-common}
 \end{itemize}
 
 \subsection{upmethdology-code.sty}
@@ -150,29 +151,29 @@ This section contains the list of all the package dependencies for the \texttt{u
 
 \texttt{upmethodology-document} class depends on:
 \begin{itemize}
-\item \texttt{upmethodology-p-common}
 \item \texttt{a4wide}
+\item \texttt{hyperref}
+\item \texttt{upmethodology-backpage}
+\item \texttt{upmethodology-code}
 \item \texttt{upmethodology-document}
 \item \texttt{upmethodology-extension}
 \item \texttt{upmethodology-frontpage}
-\item \texttt{upmethodology-backpage}
-\item \texttt{upmethodology-task}
-\item \texttt{upmethodology-code}
+\item \texttt{upmethodology-p-common}
 \item \texttt{upmethodology-spec}
+\item \texttt{upmethodology-task}
 \item \texttt{url}
-\item \texttt{hyperref}
 \end{itemize}
 
 \subsection{upmethdology-document.sty}
 
 \texttt{upmethodology-document} package depends on:
 \begin{itemize}
-\item \texttt{upmethodology-p-common}
 \item \texttt{babel}
-\item \texttt{vmargin}
 \item \texttt{upmethodology-extension}
 \item \texttt{upmethodology-fmt}
+\item \texttt{upmethodology-p-common}
 \item \texttt{upmethodology-version}
+\item \texttt{vmargin}
 \end{itemize}
 
 \subsection{upmethdology-extension.sty}
@@ -186,31 +187,32 @@ This section contains the list of all the package dependencies for the \texttt{u
 
 \texttt{upmethodology-fmt} package depends on:
 \begin{itemize}
-\item \texttt{upmethodology-p-common}
+\item \texttt{amsmath}
+\item \texttt{amsthm}
+\item \texttt{colortbl}
+\item \texttt{environ}
 \item \texttt{graphicx}
-\item \texttt{subfigure}
-\item \texttt{tabularx}
+\item \texttt{hyphenat}
+\item \texttt{mathbb}
 \item \texttt{multicol}
-\item \texttt{colortbl}
 \item \texttt{picinpar}
-\item \texttt{amsmath}
-\item \texttt{amsthm}
-\item \texttt{thmtools}
 \item \texttt{pifont}
 \item \texttt{setspace}
+\item \texttt{subfigure}
+\item \texttt{tabularx}
+\item \texttt{thmtools}
 \item \texttt{txfonts}
+\item \texttt{upmethodology-p-common}
 \item \texttt{xkeyval}
-\item \texttt{hyphenat}
-\item \texttt{mathbb}
 \end{itemize}
 
 \subsection{upmethdology-frontpage.sty}
 
 \texttt{upmethodology-frontpage} package depends on:
 \begin{itemize}
-\item \texttt{upmethodology-p-common}
-\item \texttt{upmethodology-extension}
 \item \texttt{upmethodology-document}
+\item \texttt{upmethodology-extension}
+\item \texttt{upmethodology-p-common}
 \end{itemize}
 
 \subsection{upmethdology-p-common.sty}
@@ -218,18 +220,18 @@ This section contains the list of all the package dependencies for the \texttt{u
 \texttt{upmethodology-p-common} package depends on:
 \begin{itemize}
 \item \texttt{ifthen}
-\item \texttt{xspace}
 \item \texttt{xcolor}
+\item \texttt{xspace}
 \end{itemize}
 
 \subsection{upmethdology-spec.sty}
 
 \texttt{upmethodology-spec} package depends on:
 \begin{itemize}
-\item \texttt{upmethodology-p-common}
 \item \texttt{ulem}
-\item \texttt{upmethodology-fmt}
 \item \texttt{upmethodology-code}
+\item \texttt{upmethodology-fmt}
+\item \texttt{upmethodology-p-common}
 \end{itemize}
 
 \subsection{upmethdology-task.sty}
@@ -244,8 +246,8 @@ This section contains the list of all the package dependencies for the \texttt{u
 
 \texttt{upmethodology-version} package depends on:
 \begin{itemize}
-\item \texttt{upmethodology-p-common}
 \item \texttt{upmethodology-fmt}
+\item \texttt{upmethodology-p-common}
 \end{itemize}
 
 %###########################################################
@@ -312,6 +314,10 @@ pubpage & invoke \texttt{{\textbackslash}upmpublicationpage} macro at the begini
 nopubpage & do not invoke \texttt{{\textbackslash}upmpublicationpage} macro at the begining of the document. This option overrides any 
 previous occurrence of \texttt{pubpage} option. \\
 
+\hline\hline
+
+standardlist & disable the override of the lists (enumeration, etc.) for restoring the standard \LaTeX\ lists. \\
+
 \hline
 \end{mtable}
 
diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
index b7b6f6b03b5..22f923eda3a 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
+++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
@@ -1 +1 @@
-\def\UPMVERSION{20140303}
+\def\UPMVERSION{20140620}
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
index c5105d720ec..31daf883c67 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
@@ -1,6 +1,6 @@
 % Document class for Unified Process Methodology
 %
-% Copyright (c) 2006-2013 Stephane GALLAND <galland@arakhne.org>
+% Copyright (c) 2006-2014 Stephane GALLAND <galland@arakhne.org>
 % 
 % This program is free library; you can redistribute it and/or modify
 % it under the terms of the GNU Lesser General Public License as
@@ -17,7 +17,7 @@
 % write to the Free Software Foundation, Inc., 59 Temple Place - Suite
 % 330, Boston, MA 02111-1307, USA.
 
-\global\edef\upm@package@docclazz@ver{2013/10/09}
+\global\edef\upm@package@docclazz@ver{2014/06/20}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver]
@@ -52,6 +52,11 @@
   \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,english}%
   \PassOptionsToPackage{english}{upmethodology-document}
 }
+\DeclareOption{standardlists}{%
+	\message{*********** DISABLING UPMETHODOLOGY LISTS}
+	\PassOptionsToPackage{standardlists}{upmethodology-fmt}
+}
+
 \DeclareOption{nodocumentinfo}{%
 	\global\upm@package@docclazz@nodocinfotrue%
 }
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