jmlr (10mar17)

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

2 files changed, 124 insertions, 135 deletions

diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
index 88ee0c0be28..59039a18f1e 100644
--- a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
+++ b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
@@ -1,13 +1,13 @@
 %\iffalse
 % jmlr.dtx generated using makedtx version 1.1 (c) Nicola Talbot
 % Command line args:
-%   -doc "jmlr-manual.tex"
-%   -author "Nicola Talbot"
 %   -src "jmlr.cls\Z=>jmlr.cls"
 %   -src "jmlrbook.cls\Z=>jmlrbook.cls"
 %   -section "chapter"
+%   -author "Nicola Talbot"
+%   -doc "jmlr-manual.tex"
 %   jmlr
-% Created on 2015/2/24 9:38
+% Created on 2017/3/9 9:50
 %\fi
 %\iffalse
 %<*package>
@@ -30,7 +30,7 @@
 %\fi
 % \iffalse
 % Doc-Source file to use with LaTeX2e
-% Copyright (C) 2015 Nicola Talbot, all rights reserved.
+% Copyright (C) 2017 Nicola Talbot, all rights reserved.
 % \fi
 % \iffalse
 %<*driver>
@@ -44,12 +44,14 @@
             bookmarks,
             hyperindex=false,
             pdfauthor={Nicola L.C. Talbot},
-            pdftitle={jmlr: LaTeX2e Classes for the Journal of Machine Learning Research},
+            pdftitle={jmlr: Classes for the Journal of Machine
+Learning Research (JMLR) and Proceedings of Machine Learning
+Research (PMLR)},
             pdfkeywords={LaTeX,jmlr}]{hyperref}
 
 \doxitem{Option}{option}{package options}
 
-\CheckSum{4945}
+\CheckSum{4965}
 
 
 \newcommand*{\appopt}[1]{\texttt{-{}-#1}}
@@ -63,11 +65,12 @@
 %\DeleteShortVerb{\|}
 %
 % \title{\LaTeXe\ Classes for the Journal of Machine
-%Learning Research}
+%Learning Research (JMLR) and 
+%Proceedings of Machine Learning Research (PMLR)}
 % \author{Nicola L. C. Talbot\\[10pt]
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2015-02-24 (version 1.21)}
+% \date{2017-03-09 (version 1.23)}
 % \maketitle
 %\tableofcontents
 %
@@ -79,9 +82,15 @@
 %but has been adapted to enable it to work better with the
 %\cls{combine} class to collate the articles into a book.
 %\sectionref{sec:jmlr} describes how to use the \clsfmt{jmlr} class.
-%
-%The \clsfmt{jmlrbook} class is for combining JMLR articles into a
-%book. This class uses \cls{combine} and \sty{hyperref}, which are
+%Note that JMLR W\&CP (JMLR: Workshop and Conference Proceedings)
+%will soon be renamed PMLR (Proceedings of Machine Learning
+%Research). The new \clsopt{pmlr} class option has been added
+%in anticipation of this, but only use it once the official
+%name change has taken place.
+%
+%The \clsfmt{jmlrbook} class is for combining articles that use the
+%\clsfmt{jmlr} class into a
+%book. The \clsfmt{jmlrbook} class uses \cls{combine} and \sty{hyperref}, which are
 %troublesome enough on their own but together are quite fragile. The
 %\clsfmt{jmlrbook} class redefines some internals to get
 %\clsfmt{combine} and \clsfmt{hyperref} to work together but some
@@ -119,7 +128,7 @@
 %
 %There is a Java application called \app{makejmlrbookgui} that can
 %compile all the individual papers from the book and generate the
-%accompanying HTML files for the JMLR proceedings page. It can also
+%bib file for the proceedings (according to the PMLR specifications). It can also
 %create a grey nonhyperlinked PDF/X compliant print version of the
 %book. The application can be downloaded from
 %\url{http://www.dickimaw-books.com/apps/makejmlrbookgui/} where
@@ -129,10 +138,11 @@
 %
 %There is also a Perl script called \app{makejmlrbook}, which is
 %distributed with the \clsfmt{jmlr} and \clsfmt{jmlrbook} bundle,
-%however it has been superseded by \app{makejmlrbookgui}. For those who
-%still want to use it, \app{makejmlrbook} is described in
-%\sectionref{sec:makejmlrbook}.
-%
+%however it has been superseded by \app{makejmlrbookgui}. Note that
+%PMLR (formerly JMLR W\&CP) has new format guidelines that are
+%followed by new versions of \app{makejmlrbookgui} but not by the
+%Perl script \app{makejmlrbook}, so that script is no longer
+%documented and may be dropped from future versions of this bundle.
 %
 %\section{Required Packages}
 %
@@ -146,9 +156,9 @@
 %The \clsfmt{jmlrbook} class additionally loads the \cls{combine} class
 %and the following packages: \sty{combnat}, \sty{setspace} and \sty{fink}.
 %
-%The \app{makejmlrbookgui} application requires Java (at least
-%JRE~7), \TeX, \TeX4HT and Ghostscript.
-%The \app{makejmlrbook} script requires Perl, \TeX\ and \TeX4ht.
+%The \app{makejmlrbookgui} application requires Java and \TeX.
+%(GhostScript is also required for the print-ready version of the
+%book.)
 %
 %\chapter{Guidelines for Article Authors}
 %\label{sec:jmlr}
@@ -161,8 +171,10 @@
 %\begin{description}
 %\item[\clsopt{nowcp}]The article is for the Journal of Machine
 %Learning Research (default).
+%\item[\clsopt{pmlr}] The article is for the Proceedings of Machine
+%Learning Research (PMLR). 
 %\item[\clsopt{wcp}] The article is for JMLR Workshop and Conference 
-%Proceedings.
+%Proceedings (JMLR W\&CP).
 %
 %\item[\clsopt{twocolumn}] Use two-column style.
 %
@@ -1075,25 +1087,33 @@
 %Before you compile the book, make sure that all the articles 
 %compile as stand-alone documents (and run Bib\TeX\ where
 %necessary). You can use the \app{makejmlrbookgui} application to compile
-%the book and create associated HTML files. See 
+%the book. See 
 %\url{http://www.dickimaw-books.com/apps/makejmlrbookgui/} for details.
 %
 %\section{\clsfmt{jmlrbook} Class Options}
 %\begin{description}
 %\item[\clsopt{nowcp}]The imported pre-published articles were 
 %published in the Journal of Machine Learning Research (default).
+%\item[\clsopt{pmlr}] The imported pre-published articles were
+%published in the Proceedings of Machine Learning Research (PMLR).
 %\item[\clsopt{wcp}] The imported pre-published articles were
-%published in the JMLR Workshop and Conference Proceedings.
+%published in the JMLR Workshop and Conference Proceedings (JMLR
+%W\&CP).
 %
-%If the book has a mixture of JMLR and JMLR WCP articles, you
+%If the book has a mixture of JMLR, JMLR W\&CP or PMLR articles, you
 %can switch between them using
+%\begin{definition}[\DescribeMacro{\jmlrnowcp}]
+%\cs{jmlrnowcp}
+%\end{definition}
+%(for JMLR) or
 %\begin{definition}[\DescribeMacro{\jmlrwcp}]
 %\cs{jmlrwcp}
 %\end{definition}
-%and
-%\begin{definition}[\DescribeMacro{\jmlrnowcp}]
-%\cs{jmlrnowcp}
+%(for JMLR W\&CP) or
+%\begin{definition}[\DescribeMacro{\jmlrpmlr}]
+%\cs{jmlrpmlr}
 %\end{definition}
+%(for PMLR).
 %Alternatively, you can set the name of the journal or conference
 %proceedings using:
 %\begin{definition}[\DescribeMacro{\jmlrproceedings}]
@@ -1181,9 +1201,11 @@
 %omit the file extension. If you provide a grayscale version as
 %well as a color version, the grayscale version will be used for
 %the print version of the book. (See \sectionref{sec:color} 
-%for further details.) The optional argument, if present, is used by
-%\app{makejmlrbookgui} to make the logo a link to \meta{url} on the
-%index HTML page, otherwise it's ignored.
+%for further details.) The optional argument, if present, was
+%formerly used by \app{makejmlrbookgui} to make the logo a link to 
+%\meta{url} on the index HTML page. (The HTML pages are no longer
+%generated by the application as PMLR now generate the HTML from 
+%the .bib file for the proceedings.)
 %
 %\begin{definition}[\DescribeMacro{\team}]
 %\cs{team}\marg{team title}
@@ -1261,9 +1283,9 @@
 %standalone document for the preface. The optional argument is the
 %filename (without any extension or path) that will be used by
 %\app{makejmlrbookgui}. This defaults to \texttt{preface} but, to
-%conform with JMLR guidelines, should be changed to the surname of
+%conform with PMLR guidelines, should be changed to the surname of
 %the first author (editor) followed by the final two digits of the
-%year. See the JMLR website for further details of the guidelines.
+%year. See the PMLR website for further details of the guidelines.
 %
 %\begin{definition}[\DescribeEnv{signoff}]
 %\cs{begin}\{signoff\}\oarg{team name}\marg{date}\\
@@ -1607,91 +1629,6 @@
 %\href{http://www.dickimaw-books.com/apps/makejmlrbookgui/manual/troubleshooting.html}{troubleshooting
 %section}.
 %
-%\section{Creating the Book Using \appfmt{makejmlrbook}}
-%\label{sec:makejmlrbook}
-%
-%\begin{important}
-%The \app{makejmlrbook} script has been superseded by the 
-%\app{makejmlrbookgui} application, which can be downloaded
-%from \url{http://www.dickimaw-books.com/apps/makejmlrbookgui/}.
-%\end{important}
-%
-%The \app{makejmlrbook} Perl script is designed to make it
-%easier to produce the print and online versions of the book, as
-%well as producing an HTML index of all the imported articles with
-%links to the abstracts and PDFs of individual articles. Note that
-%for it to work properly, the articles must be imported using
-%\cs{importarticle}, \cs{importpaper} or \cs{importpubpaper}, and
-%the imported articles must use the \clsfmt{jmlr} class.
-%Note that I have only tested \app{makejmlrbook} on Linux.
-%
-%On UNIX style systems, the script can be invoked from a terminal
-%using:
-%\begin{prompt}
-%makejmlrbook \oarg{options} \meta{filename}
-%\end{prompt}
-%If that doesn't work, or you aren't using a UNIX style operating
-%system, the script can be invoked from a terminal or command
-%prompt using:
-%\begin{prompt}
-%perl makejmlrbook \oarg{options} \meta{filename}
-%\end{prompt}
-%The mandatory argument \meta{filename} is the name of the master
-%\TeX\ file containing the book. It must use the \clsfmt{jmlrbook}
-%class. You may omit the \texttt{.tex} extension. For example, if
-%the file is called \texttt{proceedings.tex}, you can call 
-%\app{makejmlrbook} as follows:
-%\begin{verbatim}
-%perl makejmlrbook proceedings
-%\end{verbatim}
-%This will create the files \texttt{proceedings-print.pdf} (the
-%print version) and \texttt{proceedings-online.pdf} (the online
-%version). It will also create a directory (folder) called 
-%\texttt{html} in which the HTML files and individual article PDFs
-%will be placed.
-%
-%The options to \app{makejmlrbook} are as follows:
-%\begin{description}
-%\item[\appopt{online}] Generate the color on-line version (default).
-%\item[\appopt{noonline}] Don't generate the color on-line version.
-%\item[\appopt{print}] Generate the grayscale print version (default).
-%\item[\appopt{noprint}] Don't generate the grayscale print version.
-%\item[\appopt{html}] Generate the HTML files and the individual article
-%PDFs (default). \emph{Caveat: TeX4HT no longer works with the
-%\clsfmt{jmlr} class.}
-%\item[\appopt{nohtml}] Don't generate the HTML files and the individual
-%article PDFs.
-%\item[\appopt{logourl} \meta{url}] Make the logo on the HTML index page link
-%to \meta{url}.
-%\item[\appopt{extractpreface}] Extract the preface as a standalone document
-%with links in the HTML index. (Only has an effect if combined with
-%\appopt{html} option.) This will only work if the preface has been put
-%inside the \env{preface} environment with the \env{signoff}
-%environment that each editor with \ics{Editor}.
-%\item[\appopt{noextractpreface}] Don't try extracting the preface.
-%(Default.)
-%\item[\appopt{batchtex}] Run \TeX\ in batch mode.
-%\item[\appopt{nobatchtex}] Don't run \TeX\ in batch mode (default).
-%\item[\appopt{quieter}] Reduce chatter to STDOUT (doesn't eliminate
-%all messages). This also runs \TeX\ in batch mode.
-%\item[\appopt{noquieter}] Don't reduce messages to STDOUT (default).
-%\item[\appopt{version}] Display the version number and exit.
-%\item[\appopt{help}] List all available options.
-%\end{description}
-%
-%There are also some more advanced options, but these haven't been
-%fully tested:
-%\begin{description}
-%\item[\appopt{latexapp} \meta{name}] Application used to call \LaTeX.
-%Defaults to \qt{pdflatex}.
-%\item[\appopt{latexopt} \meta{string}] Options to pass to \LaTeX.
-%\item[\appopt{format} \meta{string}] Output format (defaults to \qt{pdf}).
-%This may need to be changed if you change the \LaTeX\ application.
-%\item[\appopt{bibtexapp} \meta{name}] Application use to process the
-%bibliography. Defaults to \qt{bibtex}.
-%\item[\appopt{bibtexopt} \meta{string}] Options to pass to Bib\TeX.
-%\end{description}
-%
 %\StopEventually{\clearpage\phantomsection
 %  \PrintIndex
 %}
@@ -1712,7 +1649,7 @@
 % Declare class and required TeX format:
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2015/02/24 v1.21 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2017/03/09 v1.23 (NLCT) Journal of Machine Learning Research]
 %    \end{macrocode}
 %\changes{1.10}{2011-01-05}{hyperref now loaded by jmlr instead of
 %jmlrbook}
@@ -1788,7 +1725,7 @@
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\ifjmlrhtml}
-% Determine if we are using \app{TeX4ht}:
+% Determine if we are using \app{TeX4ht}. (Deprecated.)
 %    \begin{macrocode}
 \newif\ifjmlrhtml
 \jmlrhtmlfalse
@@ -1827,14 +1764,14 @@
 %    \end{macrocode}
 %\end{macro}
 %
-%\begin{macro}{\nowcp}
+%\begin{macro}{\jmlrnowcp}
 %    \begin{macrocode}
 \newcommand*{\jmlrnowcp}{%
   \jmlrproceedings{JMLR}{Journal of Machine Learning Research}%
 }
 %    \end{macrocode}
 %\end{macro}
-%\begin{macro}{\wcp}
+%\begin{macro}{\jmlrwcp}
 %\changes{1.11}{2011-03-24}{Fixed typo}
 %    \begin{macrocode}
 \newcommand*{\jmlrwcp}{%
@@ -1842,14 +1779,44 @@
 }
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\jmlrpmlr}
+%\changes{1.23}{2017-03-09}{new}
+%The JMLR W\&CP has been renamed PMLR, so provide code to switch to
+%this instead,
+%    \begin{macrocode}
+\newcommand*{\jmlrpmlr}{%
+  \jmlrproceedings{PMLR}{Proceedings of Machine Learning Research}%
+}
+%    \end{macrocode}
+%\end{macro}
 % This isn't an article for a workshop:
 %    \begin{macrocode}
 \DeclareOptionX{nowcp}{\jmlrnowcp}
 %    \end{macrocode}
-% This is an article for a workshop
+% This is an article for JMLR W\&CP
 %    \begin{macrocode}
 \DeclareOptionX{wcp}{\jmlrwcp}
 %    \end{macrocode}
+% This is an article for PMLR
+%    \begin{macrocode}
+\DeclareOptionX{pmlr}{\jmlrpmlr}
+%    \end{macrocode}
+%\begin{option}{oneside}
+%\changes{1.22}{2015/04/11}{new}
+%    \begin{macrocode}
+\DeclareOptionX{oneside}{\@twosidefalse \@mparswitchfalse}
+%    \end{macrocode}
+%\end{option}
+%\begin{option}{twoside}
+%\changes{1.22}{2015/04/11}{new}
+%    \begin{macrocode}
+\DeclareOptionX{twoside}{\@twosidetrue \@mparswitchtrue}
+%    \end{macrocode}
+%\end{option}
+% Set two-sided format
+%    \begin{macrocode}
+\@twosidetrue
+%    \end{macrocode}
 % The default paper size is letter, but provide $7 \times 10$in
 % alternative:
 %    \begin{macrocode}
@@ -1864,7 +1831,7 @@
 %    \end{macrocode}
 % Execute required options:
 %    \begin{macrocode}
-\ExecuteOptions{twoside,letterpaper}
+\ExecuteOptions{letterpaper}
 %    \end{macrocode}
 % Process options:
 %    \begin{macrocode}
@@ -1917,7 +1884,12 @@
 %    \end{macrocode}
 % Allow old command names in the event that the proceedings contains
 % a mixture of papers that use old and new versions. (This means
-% that editors need to install the newer version.)
+% that editors need to install the newer version.) For some reason, 
+% loading \sty{algorithm2e} causes the message
+%\begin{verbatim}
+%(\end occurred inside a group at level 1)
+%\end{verbatim}
+% I don't know why, but it's outside the control of this class.
 %    \begin{macrocode}
 \RequirePackage[algo2e,ruled]{algorithm2e}
 %    \end{macrocode}
@@ -1973,10 +1945,6 @@
 \widowpenalty=10000\relax
 \clubpenalty=10000\relax
 %    \end{macrocode}
-% Set two-sided format
-%    \begin{macrocode}
-\@twosidetrue
-%    \end{macrocode}
 % Put marginal notes on the outside of the page
 %    \begin{macrocode}
 \@mparswitchtrue
@@ -4416,7 +4384,7 @@ Keywords:} \ignorespaces}%
 %    \end{macrocode}
 % Declare class:
 %    \begin{macrocode}
-\ProvidesClass{jmlrbook}[2015/02/24 v1.21 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2017/03/09 v1.23 (NLCT) JMLR Book Style]
 %    \end{macrocode}
 % Need \sty{xkeyval} package to have key=value class options
 %    \begin{macrocode}
@@ -4530,7 +4498,7 @@ Keywords:} \ignorespaces}%
 }
 %    \end{macrocode}
 %\end{macro}
-% Pass \clsopt{wcp} and \clsopt{nowcp} options to \clsfmt{jmlr} and
+% Pass \clsopt{wcp}, \clsopt{pmlr} and \clsopt{nowcp} options to \clsfmt{jmlr} and
 % set preface header.
 %\begin{option}{wcp}
 %\changes{1.21}{2015-02-24}{No longer changes preface header}
@@ -4540,6 +4508,14 @@ Keywords:} \ignorespaces}%
 }
 %    \end{macrocode}
 %\end{option}
+%\begin{option}{pmlr}
+%\changes{1.23}{2017-03-09}{new}
+%    \begin{macrocode}
+\DeclareOptionX{pmlr}{%
+  \PassOptionsToClass{\CurrentOption}{jmlr}%
+}
+%    \end{macrocode}
+%\end{option}
 %\begin{option}{nowcp}
 %\changes{1.21}{2015-02-24}{No longer changes preface header}
 %    \begin{macrocode}
@@ -4580,6 +4556,23 @@ Keywords:} \ignorespaces}%
 %    \end{macrocode}
 %\end{option}
 %
+% Switch on two-side mode by default
+%    \begin{macrocode}
+\@twosidetrue
+%    \end{macrocode}
+%\begin{option}{oneside}
+%\changes{1.22}{2015/04/11}{new}
+%    \begin{macrocode}
+\DeclareOptionX{oneside}{\@twosidefalse \@mparswitchfalse}
+%    \end{macrocode}
+%\end{option}
+%\begin{option}{twoside}
+%\changes{1.22}{2015/04/11}{new}
+%    \begin{macrocode}
+\DeclareOptionX{twoside}{\@twosidetrue \@mparswitchtrue}
+%    \end{macrocode}
+%\end{option}
+%
 %\begin{option}{pdfxa}
 %\changes{1.13}{2012/02/25}{new}
 %    \begin{macrocode}
@@ -4856,10 +4849,6 @@ Keywords:} \ignorespaces}%
      \expandafter\NAT@parse@date\NAT@date??????@@%
      \ifciteindex\NAT@index\fi}
 %    \end{macrocode}
-% Switch on two-side mode
-%    \begin{macrocode}
-\@twosidetrue
-%    \end{macrocode}
 % Start new chapters on the right hand page:
 %    \begin{macrocode}
 \newif\if@openright
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
index 84b299631b6..4af6c73991a 100644
--- a/Master/texmf-dist/source/latex/jmlr/jmlr.ins
+++ b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
@@ -1,10 +1,10 @@
-% jmlr.ins generated using makedtx version 1.1 2015/2/24 9:38
+% jmlr.ins generated using makedtx version 1.1 2017/3/9 9:50
 \input docstrip
 
 \preamble
 
  jmlr.dtx
- Copyright 2015 Nicola Talbot
+ Copyright 2017 Nicola Talbot
 
  This work may be distributed and/or modified under the
  conditions of the LaTeX Project Public License, either version 1.3