upmethodology (10mar17)

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

4 files changed, 14 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
index f12605e5149..e557d96e44f 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 d0e2dcc1211..ef4250ca6b7 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
+++ b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
@@ -2,8 +2,9 @@
 
 \setfrontcover{classic}
 
-\declaredocument{\LaTeX\ Packages for Unified Process Methodology}{Official Documentation}{UPM-2017-01}
+\declaredocument{\LaTeX\ Packages for Unified Process Methodology}{Official Documentation}{UPM-2017-02}
 
+\updateversion{23.1}{\makedate{10}{03}{2017}}{Fixing subfigure invalid alignement.}{\upmpublic}
 \updateversion{23.0}{\makedate{17}{02}{2017}}{Replace the package \texttt{subfigure} by \texttt{subcaption}.}{\upmpublic}
 \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}
@@ -489,9 +490,9 @@ These two macros enable you to include an image in your document. The parameters
 Inside the environment \texttt{{\textbackslash}mfigures[*]}, you could use the macro \texttt{{\textbackslash}mfigure} to properly include a subfigure (the first optional parameter is ignored), or you could use the macro \texttt{{\textbackslash}msubfigure\{options\}\{file\}\{caption\}}.
 
 The figure~\figref{example:msubfigure} page~\figpageref{example:msubfigure} is obtained with the environment:\\
-\texttt{{\textbackslash}begin\{mfigures\}\{Example of subfigures with {\textbackslash}texttt\{mfigures\}\}\{example:msubfigure\}}\\
+\texttt{{\textbackslash}begin\{mfigures\}\{Example of subfigures with {\textbackslash}texttt\{msubfigures\}\}\{example:msubfigure\}}\\
 \texttt{{\textbackslash}mfigure\{width=.4{\textbackslash}linewidth\}\{img1\}\{First subfigure\}\{example:firstsubfigure\}} \\
-\texttt{{\textbackslash}hfill} \\
+\texttt{{\textbackslash}hspace\{1cm\}} \\
 \texttt{{\textbackslash}msubfigure\{width=.4{\textbackslash}linewidth\}\{img2\}\{Second subfigure\}} \\
 \texttt{{\textbackslash}end\{mfigures\}}
 
@@ -499,7 +500,7 @@ The reference and page reference are obtained with \texttt{{\textbackslash}figre
 
 \begin{mfigures}{Example of subfigures with \texttt{mfigures}}{example:msubfigure}
 	\mfigure{width=.4\linewidth}{arakhne_org_logo}{First subfigure}{example:firstsubfigure}
-	\hfill
+	\hspace{1cm}
 	\msubfigure{width=.4\linewidth}{figure_and_tex}{Second subfigure}
 \end{mfigures}
 
diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
index 4091722313d..ff2ff2377ec 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
+++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
@@ -1 +1 @@
-\def\UPMVERSION{20170217}
+\def\UPMVERSION{20170310}
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index 0465becf08f..d7e69e0a0f1 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/02/17}
+\global\edef\upm@package@fmt@ver{2017/03/10}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -203,18 +203,18 @@
 	%options,filename,caption,label
 	\renewcommand{\mfigure}[5][]{%
 		\xdef\upm@tmp@subfigure@label{\alph{upm@subfigure@count}}%
-		\includegraphics[##2]{##3}%
-		\subcaption{##4}%
-		\label{fig:##5}%
-		\label{fig:#4:\upm@tmp@subfigure@label}%
+		\subcaptionbox{##4%
+			\label{fig:##5}%
+			\label{fig:#4:\upm@tmp@subfigure@label}%
+		}{\includegraphics[##2]{##3}}%
 		\addtocounter{upm@subfigure@count}{1}%
 	}
 	%options,filename,caption
 	\newcommand{\msubfigure}[3]{%
 		\xdef\upm@tmp@subfigure@label{\alph{upm@subfigure@count}}%
-		\includegraphics[##1]{##2}%
-        \subcaption{##3}%
-		\label{fig:#4:\upm@tmp@subfigure@label}%
+		\subcaptionbox{##3%
+			\label{fig:#4:\upm@tmp@subfigure@label}%
+		}{\includegraphics[##1]{##2}}%
 		\addtocounter{upm@subfigure@count}{1}%
 	}
 	\setcounter{upm@subfigure@count}{1}%