upmethodology (11dec17)

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

7 files changed, 18 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/upmethodology/caution.png b/Master/texmf-dist/doc/latex/upmethodology/upm_caution.png
index 892e28aad57..892e28aad57 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/caution.png
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_caution.png
diff --git a/Master/texmf-dist/doc/latex/upmethodology/info.png b/Master/texmf-dist/doc/latex/upmethodology/upm_info.png
index ea470f49afa..ea470f49afa 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/info.png
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_info.png
diff --git a/Master/texmf-dist/doc/latex/upmethodology/question.png b/Master/texmf-dist/doc/latex/upmethodology/upm_question.png
index a959004aa73..a959004aa73 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/question.png
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_question.png
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
index 0267346b03e..89561bc47ae 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 62b3431c522..6f2a9c2948c 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
+++ b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
@@ -7,6 +7,7 @@
 \updateversion{23.0}{\makedate{17}{02}{2017}}{Replace the package \texttt{subfigure} by \texttt{subcaption}.}{\upmpublic}
 \incsubversion{\makedate{10}{03}{2017}}{Fixing subfigure invalid alignement.}{\upmpublic}
 \incsubversion{\makedate{08}{08}{2017}}{Fixing spelling errors and typos.}{\upmpublic}
+\incsubversion{\makedate{28}{11}{2017}}{Add 'standardlists' option.}{\upmpublic}
 
 \addauthorvalidator*[galland@arakhne.org]{St{\'e}phane}{Galland}{Original Author}
 \addauthor*{Frans}{van Dunn\'e}{Reviewer}
@@ -313,6 +314,10 @@ nofrontcover & do not put a cover page at the beginning of the document. \\
 backcover & put the cover page at the end of the document. \\
 nobackcover & do not put a cover page at the end of the document. \\
 
+\hline\hline
+
+standardlists & The style does not override the standard list, description and enumeration definitions. \\
+
 \hline
 \end{mtable}
 
diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
index d900739a7b5..6b9e66e5af3 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
+++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
@@ -1 +1 @@
-\def\UPMVERSION{20170808}
+\def\UPMVERSION{20171210}
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index b5b1d4ae360..057e348e887 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{2017/08/08}
+\global\edef\upm@package@fmt@ver{2017/12/10}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -1007,6 +1007,14 @@
 	\fi%
 	\xspace%
 }
+\newcommand{\upmmakenamestar}[4][\relax]{%
+	\ifx#1\relax%
+		{\upm@format@lastname@format{#3}#4\upm@format@firstname@format{#2}}%
+	\else%
+		{\upm@format@lastname@format{#3}#4\upm@format@von@format{#1}#4\upm@format@firstname@format{#2}}%
+	\fi%
+	\xspace%
+}
 
 %\makename[von]{firstname}{lastname}
 \newcommand{\makename}[3][\relax]{%
@@ -1361,19 +1369,19 @@
 }
 
 \newenvironment{upmcaution}[1][\linewidth]{%
-	\upm@highligh@box{#1}{caution.png}%
+	\upm@highligh@box{#1}{upm_caution.png}%
 }{%
 	\endupm@highligh@box%
 }
 
 \newenvironment{upminfo}[1][\linewidth]{%
-	\upm@highligh@box{#1}{info.png}%
+	\upm@highligh@box{#1}{upm_info.png}%
 }{%
 	\endupm@highligh@box%
 }
 
 \newenvironment{upmquestion}[1][\linewidth]{%
-	\upm@highligh@box{#1}{question.png}%
+	\upm@highligh@box{#1}{upm_question.png}%
 }{%
 	\endupm@highligh@box%
 }