upmethodology (24apr15)

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

6 files changed, 16 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
index 338aeb9b0c5..8bb2203cf63 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 325d9d4e130..e9a22f87e0f 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
+++ b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
@@ -2,7 +2,7 @@
 
 \setfrontcover{classic}
 
-\declaredocument{\LaTeX\ Packages for Unified Process Methodology}{Official Documentation}{UPM-2012-01}
+\declaredocument{\LaTeX\ Packages for Unified Process Methodology}{Official Documentation}{UPM-2015-01}
 
 \updateversion{22.0}{\makedate{15}{08}{2013}}{Add the macros: \texttt{{\textbackslash}textup}, \texttt{{\textbackslash}textsubscript}, \texttt{{\textbackslash}textdown}, \texttt{{\textbackslash}textsubscript}, \texttt{{\textbackslash}Emph}. Add the environments \texttt{enumdescription}, \texttt{enumdescriptionx}.}{\upmpublic}
 \incversion{\makedate{17}{08}{2013}}{Update the second parameter of \texttt{{\textbackslash}mfigurewtex} to have the same semantic as for \texttt{{\textbackslash}mfigure}.}{\upmpublic}
@@ -22,6 +22,7 @@
 \incsubversion{\makedate{20}{06}{2014}}{Add the class option \texttt{standardlists}. Add the dependency to \texttt{environ}.}{\upmpublic}
 \incversion{\makedate{09}{07}{2014}}{Add the environment \texttt{emphbox}.}{\upmpublic}
 \incsubversion{\makedate{10}{09}{2014}}{Complete the documentation of \texttt{enumerate}.}{\upmpublic}
+\incversion{\makedate{24}{05}{2015}}{Add explanations about the macros on the current language.}{\upmpublic}
 
 \addauthorvalidator*[galland@arakhne.org]{St{\'e}phane}{Galland}{Original Author}
 \addauthor*{Frans}{van Dunn\'e}{Reviewer}
@@ -1659,6 +1660,10 @@ The package \texttt{upmethodology-document} provides the \texttt{{\textbackslash
 
 \section{Localization}
 
+The current language is defined in the macro \texttt{{\textbackslash}upmcurrentlang}.
+
+For testing the current language, you could use the macro \texttt{{\textbackslash}ifuplang\{lang\_id\}\{then macros\}\{else macros\}}. This macro tests if the given \texttt{lang\_id} corresponds to the value expended by the macro \texttt{{\textbackslash}upmcurrentlang}. If it is true, the macros specified in the ``then macros'' are expanded. Otherwise, the macros specified in the ``else macros'' are expanded.
+
 The following macros defines some localized strings used by \texttt{upmethodology-document}:
 \begin{itemize}
 \item \texttt{{\textbackslash}upm@lang@project}: Project;
diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
index 53e7f8a14e9..17c4a36b3f7 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
+++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
@@ -1 +1 @@
-\def\UPMVERSION{20150227}
+\def\UPMVERSION{20150424}
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
index 9c47c8b77af..2d2365971cf 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
@@ -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@doc@ver{2013/09/29}
+\global\edef\upm@package@doc@ver{2015/04/24}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-document}[\upm@package@doc@ver]
@@ -96,7 +96,7 @@
   \upm@document@lang@english
 }
 \ExecuteOptions{english}
-\ProcessOptions
+\ProcessOptions*
 
 {\upm@lang@@}
 
@@ -115,7 +115,7 @@
 
 \newlength\listendskip
 \listendskip=\parskip
-\iflanguage{french}{%
+\ifupmlang{french}{%
 	\addto\extrasfrench{%
 		\let\upm@document@enditemizeFB\enditemizeFB%
 		\def\enditemizeFB{\upm@document@enditemizeFB\vspace{\listendskip}}%
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index 98d34aa0f4d..6428c71296a 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
@@ -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@fmt@ver{2015/02/27}
+\global\edef\upm@package@fmt@ver{2015/04/24}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -1230,7 +1230,7 @@
 % DESCRIPTION LIST WITH BULLETS
 %----------------------------------------
 \ifupm@use@override@standard@lists
-	\gdef\upm@fmt@itemizeddescription@separator{\iflanguage{french}{ :}{:}\ }
+	\gdef\upm@fmt@itemizeddescription@separator{\upm@column@char\ }
 	\newcommand{\upm@fmt@itemizeddescription@formatdescription}[1]{\textbf{#1}}
 	\newcommand{\upm@fmt@itemizeddescription@desc}[2]{%
 		\upm@fmt@itemizeddescription@formatdescription{#1#2}%
@@ -1408,7 +1408,7 @@
 \colorlet{definitionborder}{fronttableheader}
 \colorlet{definitiontextforeground}{fronttableheader}
 
-\iflanguage{french}{
+\ifupmlang{french}{
 	\gdef\definitionname{D\'efinition}
 	\gdef\listdefinitionname{Liste des d\'efinitions}
 }{
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
index 28391dfb326..166c2e0f090 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
@@ -16,7 +16,7 @@
 % 330, Boston, MA 02111-1307, USA.
 %
 
-\global\edef\upm@package@private@doctype@ver{2014/03/03}
+\global\edef\upm@package@private@doctype@ver{2015/04/24}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-p-common}[\upm@package@private@doctype@ver]
@@ -50,6 +50,7 @@
 % CURRENT LANGUAGE
 %----------------------------------------
 \def\upmcurrentlang{english}
+\def\ifupmlang#1{\ifthenelse{\equal{#1}{\upmcurrentlang}}}
 
 %----------------------------------------
 % TEST MACROS
@@ -120,7 +121,7 @@
 	\fi%
 }
 
-\newcommand{\upm@column@char}{\iflanguage{french}{ :}{:}}
+\newcommand{\upm@column@char}{\ifupmlang{french}{ :}{:}}
 
 %----------------------------------------
 % GET THE REFERENCE ID WITHOUT \REF