jmlr (26mar20)

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

14 files changed, 151 insertions, 47 deletions

diff --git a/Master/texmf-dist/doc/latex/jmlr/CHANGES b/Master/texmf-dist/doc/latex/jmlr/CHANGES
index ab51376c3f8..7bb3e80b95a 100644
--- a/Master/texmf-dist/doc/latex/jmlr/CHANGES
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/jmlr/README b/Master/texmf-dist/doc/latex/jmlr/README
index fb1947600e1..ef18e9e40ce 100644
--- a/Master/texmf-dist/doc/latex/jmlr/README
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
index 581338b6993..9c8887da039 100644
--- a/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
index 7cf60da59e6..6b5311f08e1 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
index 9c288b8fc2d..32fc16df550 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
index c59344bbddc..e13b6a6c931 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
index ac147209d6f..b45425a183f 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
index 8b3eeb1f427..dcd47fc349d 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
index 1e19ddd4369..c30a2f40cc5 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
+++ b/Master/texmf-dist/doc/latex/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/}).
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
index bde2faa1426..577b06010df 100644
--- a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
+++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
index bd12b229e80..c73ba3101cb 100644
--- a/Master/texmf-dist/source/latex/jmlr/jmlr.ins
+++ b/Master/texmf-dist/source/latex/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/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{}%