texlive[43453] Master/texmf-dist: upmethodology (10mar17)

[commits+karl at tug.org]

Revision: 43453
          http://tug.org/svn/texlive?view=revision&revision=43453
Author:   karl
Date:     2017-03-11 00:54:47 +0100 (Sat, 11 Mar 2017)
Log Message:
-----------
upmethodology (10mar17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
    trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
    trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
    trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty

Modified: trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex	2017-03-10 23:54:34 UTC (rev 43452)
+++ trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex	2017-03-10 23:54:47 UTC (rev 43453)
@@ -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 @@
 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 @@
 
 \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}
 

Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def	2017-03-10 23:54:34 UTC (rev 43452)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def	2017-03-10 23:54:47 UTC (rev 43453)
@@ -1 +1 @@
-\def\UPMVERSION{20170217}
+\def\UPMVERSION{20170310}

Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty	2017-03-10 23:54:34 UTC (rev 43452)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty	2017-03-10 23:54:47 UTC (rev 43453)
@@ -17,7 +17,7 @@
 % write to the Free Software Foundation, Inc., 59 Temple Place - Suite
 % 330, Boston, MA 02111-1307, USA.
 
-\global\edef\upm at package@fmt at ver{2017/02/17}
+\global\edef\upm at package@fmt at ver{2017/03/10}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-fmt}[\upm at package@fmt at ver]
@@ -203,18 +203,18 @@
 	%options,filename,caption,label
 	\renewcommand{\mfigure}[5][]{%
 		\xdef\upm at tmp@subfigure at label{\alph{upm at subfigure@count}}%
-		\includegraphics[##2]{##3}%
-		\subcaption{##4}%
-		\label{fig:##5}%
-		\label{fig:#4:\upm at tmp@subfigure at label}%
+		\subcaptionbox{##4%
+			\label{fig:##5}%
+			\label{fig:#4:\upm at tmp@subfigure at label}%
+		}{\includegraphics[##2]{##3}}%
 		\addtocounter{upm at subfigure@count}{1}%
 	}
 	%options,filename,caption
 	\newcommand{\msubfigure}[3]{%
 		\xdef\upm at tmp@subfigure at label{\alph{upm at subfigure@count}}%
-		\includegraphics[##1]{##2}%
-        \subcaption{##3}%
-		\label{fig:#4:\upm at tmp@subfigure at label}%
+		\subcaptionbox{##3%
+			\label{fig:#4:\upm at tmp@subfigure at label}%
+		}{\includegraphics[##1]{##2}}%
 		\addtocounter{upm at subfigure@count}{1}%
 	}
 	\setcounter{upm at subfigure@count}{1}%