11 files changed, 111 insertions, 31 deletions
diff --git a/macros/latex/contrib/jmlr/CHANGES b/macros/latex/contrib/jmlr/CHANGES
index ab51376c3f..7bb3e80b95 100644
--- a/macros/latex/contrib/jmlr/CHANGES
+++ b/macros/latex/contrib/jmlr/CHANGES
@@ -1,3 +1,10 @@
+v1.27 (2020-03-26):
+
+  * jmlrutils.sty:
+
+    Bug fix: subfigure and subtable references were producing
+    extraneous text (added check for LaTeX kernel version)
+
 v1.26 (2020-01-31):
 
   * jmlr.cls:
diff --git a/macros/latex/contrib/jmlr/README b/macros/latex/contrib/jmlr/README
index fb1947600e..ef18e9e40c 100644
--- a/macros/latex/contrib/jmlr/README
+++ b/macros/latex/contrib/jmlr/README
@@ -1,4 +1,4 @@
-LaTeX Class : jmlr bundle v1.26 (2020-01-31)
+LaTeX Class : jmlr bundle v1.27 (2020-03-26)
 
 Author      : Nicola L. C. Talbot
               dickimaw-books.com/contact
diff --git a/macros/latex/contrib/jmlr/jmlr.dtx b/macros/latex/contrib/jmlr/jmlr.dtx
index bde2faa142..577b06010d 100644
--- a/macros/latex/contrib/jmlr/jmlr.dtx
+++ b/macros/latex/contrib/jmlr/jmlr.dtx
@@ -1,14 +1,14 @@
 %\iffalse
 % jmlr.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
+%   -doc "jmlr-manual.tex"
+%   -author "Nicola Talbot"
+%   -section "chapter"
 %   -src "jmlrutils.sty\Z=>jmlrutils.sty"
 %   -src "jmlr.cls\Z=>jmlr.cls"
 %   -src "jmlrbook.cls\Z=>jmlrbook.cls"
-%   -doc "jmlr-manual.tex"
-%   -section "chapter"
-%   -author "Nicola Talbot"
 %   jmlr
-% Created on 2020/1/31 10:46
+% Created on 2020/3/26 11:30
 %\fi
 %\iffalse
 %<*package>
@@ -52,7 +52,7 @@ Research (PMLR)},
 
 \doxitem{Option}{option}{package options}
 
-\CheckSum{5237}
+\CheckSum{5259}
 
 \newcommand*{\appopt}[1]{\texttt{-{}-#1}}
 
@@ -70,7 +70,7 @@ Research (PMLR)},
 % \author{Nicola L. C. Talbot\\[10pt]
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2020-01-31 (version 1.26)}
+% \date{2020-03-26 (version 1.27)}
 % \maketitle
 %\tableofcontents
 %
@@ -1143,11 +1143,11 @@ Research (PMLR)},
 %\section{Where To Go For Help}
 %
 %If you have a general \LaTeX\ query, the first place to go to is the 
-%\urlfootref{http://www.tex.ac.uk/faq}{UK TUG FAQ}.
+%\urlfootref{https://texfaq.org/}{\TeX\ FAQ}.
 %
 %If you are unfamiliar or just getting started with \LaTeX, there's
 %a list of on-line introductions to \LaTeX\ at
-%\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex}
+%\url{https://texfaq.org/FAQ-man-latex}
 %or have a look at 
 %\href{http://www.dickimaw-books.com/latex/novices}{\LaTeX\ for Complete Novices}.
 %
@@ -1753,7 +1753,7 @@ Research (PMLR)},
 %Non-class dependent code. This package is automatically loaded by
 %\cls{jmlr} but may be used with other classes.
 %    \begin{macrocode}
-\ProvidesPackage{jmlrutils}[2020/01/31 v1.26 (NLCT)]
+\ProvidesPackage{jmlrutils}[2020/03/26 v1.27 (NLCT)]
 %    \end{macrocode}
 % Package options:
 %\begin{macro}{\ifjmlrutilsmaths}
@@ -2117,21 +2117,59 @@ Research (PMLR)},
   }
 %    \end{macrocode}
 %\end{macro}
+% The LaTeX kernel changed the definition of \cs{refstepcounter} to
+% allow \cs{p@\ldots} to have an argument. This means we need to
+% check the kernel version and pick up that extra argument if
+% present.
+%\changes{1.27}{2020-03-26}{added check for \LaTeX\ kernel version}
+%    \begin{macrocode}
+  \@ifl@t@r\fmtversion{2019/08/22}%
+  {
+%    \end{macrocode}
+% Newer kernel versions.
 %\begin{macro}{\@subfigurelabel}
 % Define how label appears.
 %    \begin{macrocode}
-  \newcommand*\@subfigurelabel[2]{#1\subfigurelabel{#2}}
+    \newcommand*\@subfigurelabel[3]{#1\subfigurelabel{#2}}
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\@subfigref}
+%    \begin{macrocode}
+    \newcommand*\@subfigref[1]{%
+      {%
+        \def\@subfigurelabel##1##2##3{\subfigurelabel{##2}}%
+        \ref{#1}%
+      }%
+    }
+%    \end{macrocode}
+%\end{macro}
+%    \begin{macrocode}
+  }%
+  {
+%    \end{macrocode}
+% Older kernel versions.
+%\begin{macro}{\@subfigurelabel}
+% Define how label appears.
+%    \begin{macrocode}
+    \newcommand*\@subfigurelabel[2]{#1\subfigurelabel{#2}}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@subfigref}
+%    \begin{macrocode}
+    \newcommand*\@subfigref[1]{%
+      {%
+        \def\@subfigurelabel##1##2{\subfigurelabel{##2}}%
+        \ref{#1}%
+      }%
+    }
+%    \end{macrocode}
+%\end{macro}
+%    \begin{macrocode}
+  }
+%    \end{macrocode}
 %\begin{macro}{\subfigref}
 % Reference the sub-figure without including the figure number.
 %    \begin{macrocode}
-  \newcommand*\@subfigref[1]{%
-    {%
-      \def\@subfigurelabel##1##2{\subfigurelabel{##2}}%
-      \ref{#1}%
-    }%
-  }
   \newcommand*{\subfigref}[1]{%
     \let\@objectname\@empty
     \def\@objectref{}%
@@ -2229,21 +2267,56 @@ Research (PMLR)},
   }
 %    \end{macrocode}
 %\end{macro}
+%As with \cs{@subfigure} we again need to check \LaTeX\ kernel version.
+%\changes{1.27}{2020-03-26}{added check for \LaTeX\ kernel version}
+%    \begin{macrocode}
+  \@ifl@t@r\fmtversion{2019/08/22}%
+  {
+%    \end{macrocode}
+% Newer kernel versions.
 %\begin{macro}{\@subtablelabel}
 % Define how label appears.
 %    \begin{macrocode}
-  \newcommand*\@subtablelabel[2]{#1\subtablelabel{#2}}
+    \newcommand*\@subtablelabel[3]{#1\subtablelabel{#2}}
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\@subtabref}
+%    \begin{macrocode}
+    \newcommand*\@subtabref[1]{%
+      {%
+        \def\@subtablelabel##1##2##3{\subtablelabel{##2}}%
+        \ref{#1}%
+      }%
+    }
+%    \end{macrocode}
+%\end{macro}
+%    \begin{macrocode}
+  }%
+  {
+%    \end{macrocode}
+% Older kernel versions.
+%\begin{macro}{\@subtablelabel}
+% Define how label appears.
+%    \begin{macrocode}
+    \newcommand*\@subtablelabel[2]{#1\subtablelabel{#2}}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@subtabref}
+%    \begin{macrocode}
+    \newcommand*\@subtabref[1]{%
+      {%
+        \def\@subtablelabel##1##2{\subtablelabel{##2}}%
+        \ref{#1}%
+      }%
+    }
+%    \end{macrocode}
+%\end{macro}
+%    \begin{macrocode}
+  }%
+%    \end{macrocode}
 %\begin{macro}{\subtabref}
 % Reference the sub-table without including the table number.
 %    \begin{macrocode}
-  \newcommand*\@subtabref[1]{%
-    {%
-      \def\@subtablelabel##1##2{\subtablelabel{##2}}%
-      \ref{#1}%
-    }%
-  }
   \newcommand*{\subtabref}[1]{%
     \let\@objectname\@empty
     \def\@objectref{}%
@@ -2680,7 +2753,7 @@ Research (PMLR)},
 % Declare class and required TeX format:
 %    \begin{macrocode}
 \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]
 %    \end{macrocode}
 %\changes{1.10}{2011-01-05}{hyperref now loaded by jmlr instead of
 %jmlrbook}
@@ -4806,7 +4879,7 @@ Keywords:} \ignorespaces}%
 %    \end{macrocode}
 % Declare class:
 %    \begin{macrocode}
-\ProvidesClass{jmlrbook}[2020/01/31 v1.26 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2020/03/26 v1.27 (NLCT) JMLR Book Style]
 %    \end{macrocode}
 % Need \sty{xkeyval} package to have key=value class options
 %    \begin{macrocode}
diff --git a/macros/latex/contrib/jmlr/jmlr.ins b/macros/latex/contrib/jmlr/jmlr.ins
index bd12b229e8..c73ba3101c 100644
--- a/macros/latex/contrib/jmlr/jmlr.ins
+++ b/macros/latex/contrib/jmlr/jmlr.ins
@@ -1,4 +1,4 @@
-% jmlr.ins generated using makedtx version 1.2 2020/1/31 10:46
+% jmlr.ins generated using makedtx version 1.2 2020/3/26 11:30
 \input docstrip
 
 \preamble
diff --git a/macros/latex/contrib/jmlr/jmlr.pdf b/macros/latex/contrib/jmlr/jmlr.pdf
index 581338b699..9c8887da03 100644
--- a/macros/latex/contrib/jmlr/jmlr.pdf
+++ b/macros/latex/contrib/jmlr/jmlr.pdf
diff --git a/macros/latex/contrib/jmlr/sample-books/jmlrbook-sample.pdf b/macros/latex/contrib/jmlr/sample-books/jmlrbook-sample.pdf
index 7cf60da59e..6b5311f08e 100644
--- a/macros/latex/contrib/jmlr/sample-books/jmlrbook-sample.pdf
+++ b/macros/latex/contrib/jmlr/sample-books/jmlrbook-sample.pdf
diff --git a/macros/latex/contrib/jmlr/sample-books/proceedings-sample.pdf b/macros/latex/contrib/jmlr/sample-books/proceedings-sample.pdf
index 9c288b8fc2..32fc16df55 100644
--- a/macros/latex/contrib/jmlr/sample-books/proceedings-sample.pdf
+++ b/macros/latex/contrib/jmlr/sample-books/proceedings-sample.pdf
diff --git a/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.pdf b/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.pdf
index c59344bbdd..e13b6a6c93 100644
--- a/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.pdf
+++ b/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.pdf
diff --git a/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.tex b/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.tex
index ac147209d6..b45425a183 100644
--- a/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.tex
+++ b/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.tex
@@ -128,9 +128,9 @@ the video tutorials for the production editors at
 Please also ensure that your document will compile with PDF\LaTeX.
 If you have an error message that's puzzling you, first check for it
 at the UK TUG FAQ
-\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex}.  If
+\url{https://texfaq.org/FAQ-man-latex}.  If
 that doesn't help, create a minimal working example (see
-\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}) and post
+\url{https://www.dickimaw-books.com/latex/minexample/}) and post
 to somewhere like \TeX\ on StackExchange
 (\url{http://tex.stackexchange.com/}) or the \LaTeX\ Community Forum
 (\url{http://www.latex-community.org/forum/}).
diff --git a/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.pdf b/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.pdf
index 8b3eeb1f42..dcd47fc349 100644
--- a/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.pdf
+++ b/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.pdf
diff --git a/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.tex b/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.tex
index 1e19ddd436..c30a2f40cc 100644
--- a/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.tex
+++ b/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.tex
@@ -102,9 +102,9 @@ commands, such as \verb|\rm|, and obsolete packages, such as
 Please also ensure that your document will compile with PDF\LaTeX.
 If you have an error message that's puzzling you, first check for it
 at the UK TUG FAQ
-\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex}.  If
+\url{https://texfaq.org/FAQ-man-latex}.  If
 that doesn't help, create a minimal working example (see
-\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}) and post
+\url{https://www.dickimaw-books.com/latex/minexample}) and post
 to somewhere like TeX on StackExchange
 (\url{http://tex.stackexchange.com/}) or the LaTeX Community Forum
 (\url{http://www.latex-community.org/forum/}).