From dedac2fcc2339e6d9cddef8edb046fd0e04c397e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Mar 2017 23:54:47 +0000 Subject: upmethodology (10mar17) git-svn-id: svn://tug.org/texlive/trunk@43453 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def | 2 +- .../tex/latex/upmethodology/upmethodology-fmt.sty | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/latex/upmethodology') 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}% -- cgit v1.2.3