texlive[54562] Master/texmf-dist: jmlr (26mar20)
commits+karl at tug.org
commits+karl at tug.org
Thu Mar 26 22:29:05 CET 2020
Revision: 54562
http://tug.org/svn/texlive?view=revision&revision=54562
Author: karl
Date: 2020-03-26 22:29:05 +0100 (Thu, 26 Mar 2020)
Log Message:
-----------
jmlr (26mar20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/jmlr/CHANGES
trunk/Master/texmf-dist/doc/latex/jmlr/README
trunk/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
trunk/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
trunk/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
trunk/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
trunk/Master/texmf-dist/source/latex/jmlr/jmlr.ins
trunk/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
trunk/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
trunk/Master/texmf-dist/tex/latex/jmlr/jmlrutils.sty
Modified: trunk/Master/texmf-dist/doc/latex/jmlr/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jmlr/CHANGES 2020-03-26 21:28:43 UTC (rev 54561)
+++ trunk/Master/texmf-dist/doc/latex/jmlr/CHANGES 2020-03-26 21:29:05 UTC (rev 54562)
@@ -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:
Modified: trunk/Master/texmf-dist/doc/latex/jmlr/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jmlr/README 2020-03-26 21:28:43 UTC (rev 54561)
+++ trunk/Master/texmf-dist/doc/latex/jmlr/README 2020-03-26 21:29:05 UTC (rev 54562)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex 2020-03-26 21:28:43 UTC (rev 54561)
+++ trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex 2020-03-26 21:29:05 UTC (rev 54562)
@@ -128,9 +128,9 @@
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/}).
Modified: trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex 2020-03-26 21:28:43 UTC (rev 54561)
+++ trunk/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex 2020-03-26 21:29:05 UTC (rev 54562)
@@ -102,9 +102,9 @@
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/}).
Modified: trunk/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/jmlr/jmlr.dtx 2020-03-26 21:28:43 UTC (rev 54561)
+++ trunk/Master/texmf-dist/source/latex/jmlr/jmlr.dtx 2020-03-26 21:29:05 UTC (rev 54562)
@@ -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 @@
\doxitem{Option}{option}{package options}
-\CheckSum{5237}
+\CheckSum{5259}
\newcommand*{\appopt}[1]{\texttt{-{}-#1}}
@@ -70,7 +70,7 @@
% \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 @@
%\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 @@
%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 @@
}
% \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 at 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 @@
}
% \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 at 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 @@
% 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 @@
% \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}
Modified: trunk/Master/texmf-dist/source/latex/jmlr/jmlr.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/jmlr/jmlr.ins 2020-03-26 21:28:43 UTC (rev 54561)
+++ trunk/Master/texmf-dist/source/latex/jmlr/jmlr.ins 2020-03-26 21:29:05 UTC (rev 54562)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jmlr/jmlr.cls 2020-03-26 21:28:43 UTC (rev 54561)
+++ trunk/Master/texmf-dist/tex/latex/jmlr/jmlr.cls 2020-03-26 21:29:05 UTC (rev 54562)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls 2020-03-26 21:28:43 UTC (rev 54561)
+++ trunk/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls 2020-03-26 21:29:05 UTC (rev 54562)
@@ -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{}
Modified: trunk/Master/texmf-dist/tex/latex/jmlr/jmlrutils.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jmlr/jmlrutils.sty 2020-03-26 21:28:43 UTC (rev 54561)
+++ trunk/Master/texmf-dist/tex/latex/jmlr/jmlrutils.sty 2020-03-26 21:29:05 UTC (rev 54562)
@@ -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 at subfigure}[1]{%
\protect\@subfigurelabel{\thefigure}{\thesubfigure}%
}
- \newcommand*\@subfigurelabel[2]{#1\subfigurelabel{#2}}
- \newcommand*\@subfigref[1]{%
- {%
- \def\@subfigurelabel##1##2{\subfigurelabel{##2}}%
- \ref{#1}%
- }%
+ \@ifl at 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 at subtable}[1]{%
\protect\@subtablelabel{\thetable}{\thesubtable}%
}
- \newcommand*\@subtablelabel[2]{#1\subtablelabel{#2}}
- \newcommand*\@subtabref[1]{%
- {%
- \def\@subtablelabel##1##2{\subtablelabel{##2}}%
- \ref{#1}%
- }%
- }
+ \@ifl at 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{}%
More information about the tex-live-commits
mailing list.