upmethodology (18feb17)

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

3 files changed, 21 insertions, 21 deletions

diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
index 24838dad86e..4091722313d 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
+++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
@@ -1 +1 @@
-\def\UPMVERSION{20150810}
+\def\UPMVERSION{20170217}
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
index 2d2365971cf..c345e61553b 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
@@ -51,7 +51,7 @@
   \gdef\upm@lang@document@copyright@tex{\TeX\ is a trademark of the American Mathematical Society.}%
   \gdef\upm@lang@document@copyright@upmethodology{\texttt{tex-upmethodology} is owned by St\'ephane Galland, \arakhneorg, France.}%
   \gdef\upm@lang@document@copyright@madewith{This document was realised with \LaTeX\ and \texttt{tex-upmethodology}.}%
-  \gdef\upm@lang@document@copyright@trademarks{This document is published by the \theupmformattedpublisher. All right reserved. No part of this publication may be reproduced, stored in a retreival system, or transmitted, in any form or by any means, electronic, mechanical, photocopying, recording, or otherwise, without the prior written permission of the publishers.}
+  \gdef\upm@lang@document@copyright@trademarks{This document is published by the \theupmformattedpublisher. All rights reserved. No part of this publication may be reproduced, stored in a retreival system, or transmitted, in any form or by any means, electronic, mechanical, photocopying, recording, or otherwise, without the prior written permission of the publishers.}
   \gdef\upm@lang@document@copyright@printedin{Printed in \theupmprintedin.}
 }
 \def\upm@document@lang@french{%
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index b2413e34afe..0465becf08f 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/08/10}
+\global\edef\upm@package@fmt@ver{2017/02/17}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -91,7 +91,7 @@
 
 
 \RequirePackage{graphicx}
-\RequirePackage{subfigure}
+\RequirePackage{subcaption}
 \RequirePackage{tabularx}
 \RequirePackage{multicol}
 \RequirePackage{colortbl}
@@ -198,36 +198,36 @@
 
 \newcounter{upm@subfigure@count}
 
-\newcommand{\upm@beginsubfigure}[4]{
-	\let\upm@mfiguresaved\mfigure
+\newcommand{\upm@beginsubfigure}[4]{%
+	\let\upm@mfiguresaved\mfigure%
 	%options,filename,caption,label
-	\renewcommand{\mfigure}[5][]{
+	\renewcommand{\mfigure}[5][]{%
 		\xdef\upm@tmp@subfigure@label{\alph{upm@subfigure@count}}%
-                \subfigure[##4]{%
-			\includegraphics[##2]{##3}%
-			\label{fig:##5}%
-			\label{fig:#4:\upm@tmp@subfigure@label}%
-		}%
+		\includegraphics[##2]{##3}%
+		\subcaption{##4}%
+		\label{fig:##5}%
+		\label{fig:#4:\upm@tmp@subfigure@label}%
 		\addtocounter{upm@subfigure@count}{1}%
 	}
 	%options,filename,caption
-	\newcommand{\msubfigure}[3]{
+	\newcommand{\msubfigure}[3]{%
 		\xdef\upm@tmp@subfigure@label{\alph{upm@subfigure@count}}%
-                \subfigure[##3]{%
-			\includegraphics[##1]{##2}%
-			\label{fig:#4:\upm@tmp@subfigure@label}%
-		}%
+		\includegraphics[##1]{##2}%
+        \subcaption{##3}%
+		\label{fig:#4:\upm@tmp@subfigure@label}%
 		\addtocounter{upm@subfigure@count}{1}%
 	}
-	\setcounter{upm@subfigure@count}{1}
+	\setcounter{upm@subfigure@count}{1}%
 	\gdef\upm@mfigurescaption{#3}%
 	\gdef\upm@mfigureslabel{fig:#4}%
 	\begin{#1}[#2]\centering %
+	\begingroup%
 }
 
-\newcommand{\upm@endsubfigure}[1]{
-		\caption{\upm@mfigurescaption}%
-		\label{\upm@mfigureslabel}%
+\newcommand{\upm@endsubfigure}[1]{%
+	\endgroup%
+	\caption{\upm@mfigurescaption}%
+	\label{\upm@mfigureslabel}%
 	\end{#1}%
 	\let\mfigure\upm@mfiguresaved
 }