From 99308af4895b0e2695533e27d1dd565e81c61583 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Mar 2020 21:29:05 +0000 Subject: jmlr (26mar20) git-svn-id: svn://tug.org/texlive/trunk@54562 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/jmlr/jmlr.cls | 2 +- Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls | 2 +- Master/texmf-dist/tex/latex/jmlr/jmlrutils.sty | 52 +++++++++++++++++++------- 3 files changed, 40 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls index 51cbd082d67..3063b33dc84 100644 --- a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls +++ b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls @@ -41,7 +41,7 @@ %% First editor: %% Second editor: \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlr}[2020/01/31 v1.26 (NLCT) Journal of Machine Learning Research] +\ProvidesClass{jmlr}[2020/03/26 v1.27 (NLCT) Journal of Machine Learning Research] \RequirePackage{xkeyval} \RequirePackage{calc} \RequirePackage{etoolbox} diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls index 8a0c9ad953e..13c02220bc7 100644 --- a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls +++ b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls @@ -41,7 +41,7 @@ %% First editor: %% Second editor: \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlrbook}[2020/01/31 v1.26 (NLCT) JMLR Book Style] +\ProvidesClass{jmlrbook}[2020/03/26 v1.27 (NLCT) JMLR Book Style] \RequirePackage{xkeyval} \RequirePackage{setspace} \newcommand*\jmlrprefacepath{} diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrutils.sty b/Master/texmf-dist/tex/latex/jmlr/jmlrutils.sty index 0230e6f5fde..efdfc9ea0bb 100644 --- a/Master/texmf-dist/tex/latex/jmlr/jmlrutils.sty +++ b/Master/texmf-dist/tex/latex/jmlr/jmlrutils.sty @@ -40,7 +40,7 @@ %% Right brace \} Tilde \~} %% First editor: %% Second editor: -\ProvidesPackage{jmlrutils}[2020/01/31 v1.26 (NLCT)] +\ProvidesPackage{jmlrutils}[2020/03/26 v1.27 (NLCT)] \newif\ifjmlrutilsmaths \jmlrutilsmathstrue \DeclareOption{maths}{\jmlrutilsmathstrue} @@ -216,12 +216,24 @@ \newcommand*{\@p@subfigure}[1]{% \protect\@subfigurelabel{\thefigure}{\thesubfigure}% } - \newcommand*\@subfigurelabel[2]{#1\subfigurelabel{#2}} - \newcommand*\@subfigref[1]{% - {% - \def\@subfigurelabel##1##2{\subfigurelabel{##2}}% - \ref{#1}% - }% + \@ifl@t@r\fmtversion{2019/08/22}% + { + \newcommand*\@subfigurelabel[3]{#1\subfigurelabel{#2}} + \newcommand*\@subfigref[1]{% + {% + \def\@subfigurelabel##1##2##3{\subfigurelabel{##2}}% + \ref{#1}% + }% + } + }% + { + \newcommand*\@subfigurelabel[2]{#1\subfigurelabel{#2}} + \newcommand*\@subfigref[1]{% + {% + \def\@subfigurelabel##1##2{\subfigurelabel{##2}}% + \ref{#1}% + }% + } } \newcommand*{\subfigref}[1]{% \let\@objectname\@empty @@ -280,13 +292,25 @@ \newcommand*{\@p@subtable}[1]{% \protect\@subtablelabel{\thetable}{\thesubtable}% } - \newcommand*\@subtablelabel[2]{#1\subtablelabel{#2}} - \newcommand*\@subtabref[1]{% - {% - \def\@subtablelabel##1##2{\subtablelabel{##2}}% - \ref{#1}% - }% - } + \@ifl@t@r\fmtversion{2019/08/22}% + { + \newcommand*\@subtablelabel[3]{#1\subtablelabel{#2}} + \newcommand*\@subtabref[1]{% + {% + \def\@subtablelabel##1##2##3{\subtablelabel{##2}}% + \ref{#1}% + }% + } + }% + { + \newcommand*\@subtablelabel[2]{#1\subtablelabel{#2}} + \newcommand*\@subtabref[1]{% + {% + \def\@subtablelabel##1##2{\subtablelabel{##2}}% + \ref{#1}% + }% + } + }% \newcommand*{\subtabref}[1]{% \let\@objectname\@empty \def\@objectref{}% -- cgit v1.2.3