jmlr 1.12 (5jan12)

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

2 files changed, 252 insertions, 94 deletions

diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
index 6440de96f72..bea32ff22a6 100644
--- a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
+++ b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
@@ -7,7 +7,7 @@
 %   -author "Nicola Talbot"
 %   -codetitle "jmlr.cls Code"
 %   jmlr
-% Created on 2011/3/24 21:20
+% Created on 2012/1/5 12:59
 %\fi
 %\iffalse
 %<*package>
@@ -30,7 +30,7 @@
 %\fi
 % \iffalse
 % Doc-Source file to use with LaTeX2e
-% Copyright (C) 2011 Nicola Talbot, all rights reserved.
+% Copyright (C) 2012 Nicola Talbot, all rights reserved.
 % \fi
 % \iffalse
 %<*driver>
@@ -47,7 +47,7 @@
             pdftitle={jmlr: LaTeX2e Classes for the Journal of Machine Learning Research},
             pdfkeywords={LaTeX,jmlr}]{hyperref}
 
-\CheckSum{3806}
+\CheckSum{3918}
 \OnlyDescription
 
 \newcommand*{\appopt}[1]{\texttt{-{}-#1}}
@@ -65,7 +65,7 @@
 % \author{Nicola L. C. Talbot\\[10pt]
 %\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
 %
-% \date{2011-03-24 (version 1.11)}
+% \date{2012-01-05 (version 1.12)}
 % \maketitle
 %\tableofcontents
 %
@@ -95,6 +95,25 @@
 %PDF\LaTeX. \sectionref{sec:jmlrbook} describes how to use the 
 %\clsfmt{jmlrbook} class.
 %
+%\begin{important}
+%Note that the \clsfmt{jmlr} (and therefore \clsfmt{jmlrbook}) class automatically loads
+%the \sty{hyperref} package, but some packages need to be loaded
+%before \sty{hyperref}.
+%\end{important}
+%
+%Anything that needs to be done before \sty{hyperref} is loaded can be specified 
+%by defining the command
+%\begin{definition}[\DescribeMacro{\jmlrprehyperref}]
+%\cs{jmlrprehyperref}
+%\end{definition}
+%\emph{before} the class is loaded. For
+%example, to load the packages \styfmt{foo} and \styfmt{bar} before 
+%\sty{hyperref}, you can do:
+%\begin{verbatim}
+%\newcommand{\jmlrprehyperref}{\usepackage{foo,bar}}
+%\documentclass{jmlr}
+%\end{verbatim}
+%
 %The \app{makejmlrbook} Perl script can be used to make a book that
 %uses the \clsfmt{jmlrbook} class. In addition to creating the print
 %and online versions of the book, it will compile the individual
@@ -146,8 +165,6 @@
 %\item[{\clsopt[bottom]{tablecaption}}] in a \env{table} environment,
 %\ics{floatconts} puts the caption at the bottom.
 %
-%\item[\clsopt{prehyperref}=\marg{stuff}] Does \meta{stuff} before
-%loading \sty{hyperref}.
 %\end{description}
 %
 %\subsection{Title Information}
@@ -208,6 +225,13 @@
 %\end{definition}
 %This specifies the article's title. A short title for the page
 %header can be supplied via the optional argument \meta{short title}.
+%If you want to force a line break in the title, use
+%\begin{definition}[\DescribeMacro{\titlebreak}]
+%\cs{titlebreak}
+%\end{definition}
+%instead of \cs{newline} or \verb|\\| as this will ensure that the
+%line break doesn't also end up in the table of contents or bookmarks
+%when the article is included in a book.
 %
 %\begin{definition}[\DescribeMacro{\editor}]
 %\cs{editor}\marg{name}
@@ -224,12 +248,13 @@
 %This specifies the author. The specifications \meta{author specs}
 %are a bit different to \sty{jmlr2e} and \sty{jmlrwcp2e}. Use
 %\begin{definition}[\DescribeMacro{\Name}]
-%\cs{Name}\marg{author's name}
+%\cs{Name}\oarg{abbreviated name}\marg{author's name}
 %\end{definition}
 %to specify the author's name. Note that if the surname contains a
 %space it must be grouped (enclosed in braces \{\}). Similarly if
 %the initial letter of each forename is a diacritic it must be
-%grouped. (See below for examples.)
+%grouped. If the abbreviation of the name doesn't get parsed
+%properly you can override the default using the optional argument. (See below for examples.)
 %\begin{definition}[\DescribeMacro{\Email}]
 %\cs{Email}\marg{author's email}
 %\end{definition}
@@ -286,6 +311,14 @@
 %  \addr Address 2
 % }
 %\end{verbatim}
+%
+%\item[Example 4] The author is actually a company so there's no
+%first name and surname:
+%\begin{verbatim}
+%\author{\Name[Some Company, Ltd]{Some Company, Ltd}\Email{xyz:some.com}\\
+%  \addr Address
+%}
+%\end{verbatim}
 %\end{description}
 %
 %\subsection{Font Changing Commands}
@@ -985,21 +1018,6 @@
 %
 %\item[\clsopt{7x10}] Set the paper size to $7\times10$ inches.
 %
-%\item[\clsopt{prehyperref}=\marg{stuff}] The \clsfmt{jmlr} class 
-%automatically loads
-%the \sty{hyperref} package, but some packages need to be loaded
-%before \sty{hyperref}. This information can be specified using
-%the \clsopt{prehyperref} option. This is a key=value option. For
-%example, to load the packages \styfmt{foo} and \styfmt{bar} before 
-%\sty{hyperref}, you can do:
-%\begin{verbatim}
-%\documentclass[prehyperref={\usepackage{foo,bar}}]{jmlrbook}
-%\end{verbatim}
-%or:
-%\begin{verbatim}
-%\documentclass[prehyperref={\usepackage{foo}\usepackage{bar}}]{jmlrbook}
-%\end{verbatim}
-%
 %\item[\clsopt{10pt}] Use 10pt as the normal text size.
 %\item[\clsopt{11pt}] Use 11pt as the normal text size (default).
 %\item[\clsopt{12pt}] Use 12pt as the normal text size.
@@ -1562,7 +1580,7 @@
 % Declare class and required TeX format:
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2011/03/24 v1.11 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2012/01/05 v1.12 (NLCT) Journal of Machine Learning Research]
 %    \end{macrocode}
 %\changes{1.10}{2011-01-05}{hyperref now loaded by jmlr instead of
 %jmlrbook}
@@ -1572,16 +1590,14 @@
 %    \end{macrocode}
 % Some packages need to be loaded before \sty{hyperref} so provide a
 % hook to do this:
-%\begin{macro}{\jmlr@prehyperref}
+%\begin{macro}{\jmlrprehyperref}
+%\changes{1.12}{2012/01/05}{removed @ from name so it can be defined
+%by user}
 %    \begin{macrocode}
-\providecommand*{\jmlr@prehyperref}{}
+\providecommand*{\jmlrprehyperref}{}
 %    \end{macrocode}
 %\end{macro}
-% Provide option to add stuff before \sty{hyperref} is loaded:
-%    \begin{macrocode}
-\define@key{jmlr.cls}{prehyperref}{%
-  \renewcommand*{\jmlr@prehyperref}{#1}}
-%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{removed class option prehyperref}
 % The following conditionals are provided to make this class play nicely
 % with combine and aren't required for articles.
 %    \begin{macrocode}
@@ -1755,18 +1771,23 @@
 % Do all the stuff that needs to be done before \sty{hyperref} is
 % loaded:
 %    \begin{macrocode}
-\jmlr@prehyperref
+\jmlrprehyperref
 %    \end{macrocode}
 % Load \sty{hyperref}:
 %    \begin{macrocode}
-\usepackage[colorlinks,
+\usepackage{hyperref}
+\usepackage{nameref}
+%    \end{macrocode}
+% Set up hyperref options:
+%    \begin{macrocode}
+\hypersetup{colorlinks,
             linkcolor=blue,
             citecolor=blue,
             urlcolor=magenta,
             linktocpage,
-            plainpages=false]{hyperref}
-\usepackage{nameref}
+            plainpages=false}
 %    \end{macrocode}
+%
 % If this is the print version, need to disable the hyperlinks:
 %    \begin{macrocode}
 \ifgrayscale
@@ -1945,6 +1966,15 @@ Keywords:} \ignorespaces}%
 \setlength\aftermaketitskip{0.3in plus 0.1in minus 0.1in}
 %    \end{macrocode}
 %
+%\begin{macro}{\titlebreak}
+%\changes{1.12}{2012/01/05}{new}
+% Acts like new line in the paper title, but with jmlrbook acts like a space in
+% the table of contents and bookmarks.
+%    \begin{macrocode}
+\newcommand*{\titlebreak}{\newline}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{macro}{\title}
 % Override definition of \cs{title} to allow for an optional
 % argument (short title)
@@ -1956,6 +1986,15 @@ Keywords:} \ignorespaces}%
 }
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\@shorttitle}
+%\changes{1.12}{2012/01/05}{provided default value}
+% The short title of the document is initialised to \cs{jobname} to
+% ensure a basic document will compile even if no title is set.
+%    \begin{macrocode}
+\newcommand*{\@shorttitle}{\jobname}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{macro}{\jmlrtitlehook}
 %    \begin{macrocode}
 \newcommand*{\jmlrtitlehook}{}
@@ -2067,11 +2106,11 @@ Keywords:} \ignorespaces}%
 %\begin{macro}{\jmlrhtmlmaketitle}
 %    \begin{macrocode}
 \newcommand{\jmlrhtmlmaketitle}{%
-  \ifx\@jmlrauthors\@empty
+  \ifx\@jmlr@authors\@empty
     \sbox\jmlrbox{\let\addr\relax\@author}%
   \fi
   \noindent\HCode{<h2>}\@title\HCode{</h2>}
-  \noindent\@jmlrauthors
+  \noindent\@jmlr@authors
 }
 %    \end{macrocode}
 %\end{macro}
@@ -2193,30 +2232,51 @@ Keywords:} \ignorespaces}%
 % Get the author's name and add surname to \cs{@shortauthors}.
 % (Surnames with \qt{von} parts or with spaces in should be
 % enclosed in braces)
+%\changes{1.12}{2012/01/05}{added optional argument}
 %    \begin{macrocode}
-\newcommand*{\Name}[1]{%
+\newcommand*{\Name}[2][]{%
+  \def\@authorlist{#1}%
   \def\@forenames{}%
   \def\@surname{}%
   \def\nametag##1{}%
-  \@parsename#1 \@nil\end@parsename
+  \@parsename#2 \@nil\end@parsename
   \ifx\@shortauthor\@empty
     \ifx\@sauthor\@empty
       \global\let\@shortauthor\@surname
       \global\let\@firstsurname\@surname
     \fi
-    \protected@xdef\@jmlrauthors{\@initials\space\@surname}%
+    \ifx\@authorlist\@empty
+      \protected@xdef\@jmlrauthors{\@initials\space\@surname}%
+    \else
+      \protected@xdef\@jmlrauthors{\@authorlist}%
+    \fi
     \global\let\@firstauthor\@jmlrauthors
   \else
     \ifx\@sauthor\@empty
       \expandafter\toks@\expandafter{\@shortauthor}%
       \protected@xdef\@shortauthor{\the\toks@\space\@surname}%
     \fi
-    \protected@xdef\@jmlrauthors{\@jmlrauthors
-      \noexpand\@jmlr@authors@sep 
-      \@initials\space\@surname}%
+    \ifx\@authorlist\@empty
+      \ifx\@jmlrauthors\@empty
+        \protected@xdef\@jmlrauthors{\@initials\space\@surname}%
+      \else
+        \protected@xdef\@jmlrauthors{\@jmlrauthors
+          \noexpand\@jmlr@authors@sep 
+          \@initials\space\@surname}%
+      \fi
+    \else
+      \ifx\@jmlrauthors\@empty
+        \protected@xdef\@jmlrauthors{\@authorlist}%
+      \else
+        \protected@xdef\@jmlrauthors{\@jmlrauthors
+          \noexpand\@jmlr@authors@sep 
+          \@authorlist
+        }%
+      \fi
+    \fi
   \fi
   \def\nametag##1{##1}%
-  \@name #1%
+  \@name #2%
 }
 %    \end{macrocode}
 %\end{macro}
@@ -2376,7 +2436,7 @@ Keywords:} \ignorespaces}%
 %\changes{1.09}{2010/12/01}{added \cs{@reprint}}
 %    \begin{macrocode}
 \newcommand*{\@titlefoot}{\scriptsize\copyright\space\@jmlryear
-    \space\@jmlrauthors.\hfill
+    \space\@jmlr@authors.\hfill
     \@reprint
 }
 %    \end{macrocode}
@@ -2396,9 +2456,26 @@ Keywords:} \ignorespaces}%
 \newcommand\ps@jmlrtps{%
   \let\@mkboth\@gobbletwo
   \def\@oddhead{\scriptsize \@jmlrproceedings
-    \ifx\@jmlrvolume\@empty\else\space\@jmlrvolume\fi
-    \ifx\@jmlryear\@empty\else\space(\@jmlryear)\fi
-    \ifx\@jmlrpages\@empty\else\space\@jmlrpages\fi
+    \ifx\@jmlrvolume\@empty
+    \else
+       \space\@jmlrvolume
+       \ifx\@jmlrissue\@empty\else(\@jmlrissue)\fi
+       \ifx\@jmlrpages\@empty
+          \ifx\@jmlryear\@empty
+          \else
+             \if\@jmlrissue\@empty,\fi
+          \fi
+       \else
+          :%
+       \fi
+    \fi
+    \ifx\@jmlrpages\@empty
+    \else
+       \ifx\@jmlrvolume\@empty\space\fi
+       \@jmlrpages
+       \ifx\@jmlryear\@empty\else,\fi
+    \fi
+    \ifx\@jmlryear\@empty\else\space\@jmlryear\fi
     \hfill
     \ifx\@jmlrworkshop\@empty
       \ifx\@jmlrsubmitted\@empty
@@ -2519,11 +2596,19 @@ Keywords:} \ignorespaces}%
 \newcommand*{\@jmlrauthors}{}
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\@jmlr@authors}
+%\changes{1.12}{2012/01/05}{new}
+%    \begin{macrocode}
+\newcommand*{\@jmlr@authors}{\@jmlrauthors}
+%    \end{macrocode}
+%\end{macro}
 %\begin{macro}{\jmlrauthors}
 % This is provided in case \cs{Name} doesn't set \cs{@jmlrauthors}
 % correctly.
+%\changes{1.12}{2012/01/05}{\cs{jmlrauthors} now redefines
+%\cs{@jmlr@authors} instead of \cs{@jmlrauthors}}
 %    \begin{macrocode}
-\newcommand*{\jmlrauthors}[1]{\renewcommand*{\@jmlrauthors}{#1}}
+\newcommand*{\jmlrauthors}[1]{\global\def\@jmlr@authors{#1}}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2859,7 +2944,7 @@ Keywords:} \ignorespaces}%
       \fi
     \endgroup}
 \fi
-%     \end{macrocode}
+%    \end{macrocode}
 %
 % The \env{algorithm} environment should float like a figure or table.
 % It should use the same counter as the \env{algorithm2e} environment.
@@ -2891,7 +2976,11 @@ Keywords:} \ignorespaces}%
   \setcounter{section}{0}
   \setcounter{subsection}{0}
   \def\thesection{\Alph{section}}
-  \def\theHsection{\Alph{section}}
+%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{added chapter to \cs{theHsection} to ensure unique
+%hyperlink names in book}
+%    \begin{macrocode}
+  \def\theHsection{\theHchapter.\Alph{section}}
   \def\presectionnum{Appendix~}%
 }
 %    \end{macrocode}
@@ -3463,6 +3552,13 @@ Keywords:} \ignorespaces}%
 %    \end{macrocode}
 %\end{macro}
 %
+%\begin{macro}{\booktocpostamble}
+%\changes{?}{??}{new}
+%    \begin{macrocode}
+\newcommand*{\booktocpostamble}{}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{macro}{\booktableofcontents}
 % This is for the main table of contents when using 
 % the combine class file, and is not for use in individual
@@ -3478,6 +3574,7 @@ Keywords:} \ignorespaces}%
     \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
   \booktocpreamble
   \@starttoc{toc}%
+  \booktocpostamble
   \if@restonecol\twocolumn\fi
 }
 %    \end{macrocode}
@@ -3692,6 +3789,9 @@ Keywords:} \ignorespaces}%
    This can cause a problem for jmlrbook.}{}%
   \@ifpackageloaded{geometry}{Package `geometry' detected.\MessageBreak
    This can cause a problem for jmlrbook.}{}%
+  \@ifpackageloaded{tabularx}{%
+   \ClassError{jmlr}{Package `tabularx' detected.\MessageBreak
+    This will break footnote links.}{}}{}%
 }
 \AtBeginDocument{%
 \@jmlr@check@packages
@@ -3724,21 +3824,28 @@ Keywords:} \ignorespaces}%
 %    \end{macrocode}
 % Declare class:
 %    \begin{macrocode}
-\ProvidesClass{jmlrbook}[2011/03/24 v1.11 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2012/01/05 v1.12 (NLCT) JMLR Book Style]
 %    \end{macrocode}
 % Need \sty{xkeyval} package to have key=value class options
 %    \begin{macrocode}
 \RequirePackage{xkeyval}
 %    \end{macrocode}
-% Some packages need to be loaded before \sty{hyperref} so provide a
-% hook to do this:
+% Requires double spacing for the title page
 %    \begin{macrocode}
-\newcommand*{\jmlr@prehyperref}{}
+\RequirePackage{setspace}
 %    \end{macrocode}
-% Option to add stuff before \sty{hyperref} is loaded:
+%
+% Requires fink package to determine if the preface is in the main
+% document or in a separate file.
+%\changes{1.11}{2011-03-24}{fink package now required}
 %    \begin{macrocode}
-\define@key{jmlrbook.cls}{prehyperref}{%
-  \renewcommand*{\jmlr@prehyperref}{#1}}
+\RequirePackage{fink}
+%    \end{macrocode}
+% Some packages need to be loaded before \sty{hyperref} so provide a
+% hook to do this:
+%\changes{1.12}{2012/01/05}{changed \cs{newcommand} to \cs{providecommand}}
+%    \begin{macrocode}
+\providecommand*{\jmlrprehyperref}{}
 %    \end{macrocode}
 % Determine whether to select color or grayscale
 %    \begin{macrocode}
@@ -3823,17 +3930,6 @@ Keywords:} \ignorespaces}%
      \expandafter\NAT@parse@date\NAT@date??????@@%
      \ifciteindex\NAT@index\fi}
 %    \end{macrocode}
-% Requires double spacing for the title page
-%    \begin{macrocode}
-\RequirePackage{setspace}
-%    \end{macrocode}
-%
-% Requires fink package to determine if the preface is in the main
-% document or in a separate file.
-%\changes{1.11}{2011-03-24}{fink package now required}
-%    \begin{macrocode}
-\RequirePackage{fink}
-%    \end{macrocode}
 % Switch on two-side mode
 %    \begin{macrocode}
 \@twosidetrue
@@ -3993,7 +4089,7 @@ Keywords:} \ignorespaces}%
 \newcommand*{\volume}[1]{\renewcommand*{\@volume}{#1}}
 %    \end{macrocode}
 %\end{macro}
-%\begin{macro}{\issue}
+%\begin{macro}{\jmlrissue}
 %    \begin{macrocode}
 \newcommand*{\@issue}{\@jmlrissue}
 \newcommand*{\issue}[1]{\renewcommand*{\@issue}{#1}}
@@ -4335,24 +4431,44 @@ Keywords:} \ignorespaces}%
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\theHalgorithm}
+%\changes{1.12}{2012/01/05}{in definition, changed \cs{thechapter}
+%to \cs{theHchapter}}
 %    \begin{macrocode}
-\def\theHalgorithm{\thechapter.\thealgorithm}
+\def\theHalgorithm{\theHchapter.\thealgorithm}
 %    \end{macrocode}
 %\end{macro}
-\def\theHexample{\thechapter.\theexample}
-\def\theHtheorem{\thechapter.\thetheorem}
+\def\theHexample{\theHchapter.\theexample}
+\def\theHtheorem{\theHchapter.\thetheorem}
 %\begin{macro}{\theHsection}
 %    \begin{macrocode}
-\def\theHsection{\thechapter.\thesection}
-\def\theHsubsection{\thechapter.\thesubsection}
-\def\theHsubsubsection{\thechapter.\thesubsubsection}
-\def\theHparagraph{\thechapter.\theparagraph}
+\def\theHsection{\theHchapter.\thesection}
+\def\theHsubsection{\theHchapter.\thesubsection}
+\def\theHsubsubsection{\theHchapter.\thesubsubsection}
+\def\theHparagraph{\theHchapter.\theparagraph}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\theHsubfigure}
 %    \begin{macrocode}
-\def\theHsubfigure{\thechapter.\thefigure.\thesubfigure}
-\def\theHsubtable{\thechapter.\thetable.\thesubtable}
+\def\theHsubfigure{\theHfigure.\arabic{subfigure}}
+\def\theHsubtable{\theHtable.\arabic{subtable}}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\theHfootnote}
+%\changes{1.12}{2012/01/05}{new}
+%    \begin{macrocode}
+\def\theHfootnote{\theHchapter.\alpha{footnote}}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\theHtable}
+%\changes{1.12}{2012/01/05}{new}
+%    \begin{macrocode}
+\def\theHtable{\theHchapter.\arabic{table}}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\theHfigure}
+%\changes{1.12}{2012/01/05}{new}
+%    \begin{macrocode}
+\def\theHfigure{\theHchapter.\arabic{figure}}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\mailto}
@@ -4655,18 +4771,30 @@ Keywords:} \ignorespaces}%
 %\changes{1.09}{2010/12/01}{Added \cs{label} to \cs{jmlrmaketitlehook}}
 %    \begin{macrocode}
       \label{}%
+      \def\titlebreak{ }%
       \addtomaincontents{toc}%
-        {\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
+%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{changed \cs{@shorttitle} to \cs{@title}}
+%    \begin{macrocode}
+        {%
+          \protect\contentsline{papertitle}{\@title}{\thepage}%
 	   {page.\thepage}}%
-      \pdfbookmark{\@shorttitle}{chapter.\thechapter}%
+      \pdfbookmark{\@shorttitle}{chapter.\theHchapter}%
       \def\@jmlr@authors@sep{ \& }%
-      \tocchapterpubauthor{\@jmlrauthors}%
+%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{changed \cs{@jmlrauthors} to \cs{@jmlr@authors}}
+%    \begin{macrocode}
+      \tocchapterpubauthor{\@jmlr@authors}%
       {%
         \@jmlrabbrvproceedings
         \ifx\@jmlrvolume\@empty
            \ifx\@jmlrpages\@empty\else\space\fi
         \else
            \space\@jmlrvolume
+           \ifx\@jmlrissue\@empty
+           \else
+              (\@jmlrissue)%
+           \fi
            \ifx\@jmlrpages\@empty\else:\fi
         \fi
         \ifx\@jmlrpages\@empty
@@ -4676,7 +4804,10 @@ Keywords:} \ignorespaces}%
         \fi
         \space\@jmlryear
       }%
-      \@write@author{#1}{\@jmlrauthors}%
+%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{changed \cs{@jmlrauthors} to \cs{@jmlr@authors}}
+%    \begin{macrocode}
+      \@write@author{#1}{\@jmlr@authors}%
     }%
     \def\InputIfFileExists##1##2##3{%
        \IfFileExists{##1}{%
@@ -4694,6 +4825,7 @@ Keywords:} \ignorespaces}%
   \gdef\@shortauthor{}%
   \gdef\@shorttitle{}%
   \gdef\@firstauthor{}%
+  \gdef\@jmlr@authors{\@jmlrauthors}%
   \gdef\@jmlrauthors{}%
   \gdef\@firstsurname{}%
 }
@@ -4722,24 +4854,40 @@ not permitted outside `jmlrpapers' environment}{}%
 %\changes{1.09}{2010/12/01}{Added \cs{label} to \cs{jmlrmaketitlehook}}
 %    \begin{macrocode}
       \label{}%
+      \def\titlebreak{ }%
       \addtomaincontents{toc}%
-        {\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
+%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{changed \cs{@shorttitle} to \cs{@title}}
+%    \begin{macrocode}
+        {%
+          \protect\contentsline{papertitle}{\@title}{\thepage}%
 	   {page.\thepage}}%
-      \pdfbookmark{\@shorttitle}{chapter.\thechapter}%
+      \pdfbookmark{\@shorttitle}{chapter.\theHchapter}%
       \def\@jmlr@authors@sep{ \& }%
-      \tocchapterpubauthor{\@jmlrauthors}%
+%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{changed \cs{@jmlrauthors} to \cs{@jmlr@authors}}
+%    \begin{macrocode}
+      \tocchapterpubauthor{\@jmlr@authors}%
       {%
         \@jmlrabbrvproceedings
         \ifx\@jmlrvolume\@empty
            \space
         \else
-           \space\@jmlrvolume:%
+           \space\@jmlrvolume
+           \ifx\@jmlrissue\@empty
+           \else
+              (\@jmlrissue)%
+           \fi
+           :%
         \fi
         \protect\articlepagesref{#1}%
         \ifx\@jmlryear\@empty\else,\fi
         \space\@jmlryear
       }%
-      \@write@author{#1}{\@jmlrauthors}%
+%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{changed \cs{@jmlrauthors} to \cs{@jmlr@authors}}
+%    \begin{macrocode}
+      \@write@author{#1}{\@jmlr@authors}%
     }%
     \def\InputIfFileExists##1##2##3{%
        \IfFileExists{##1}{%
@@ -4757,6 +4905,7 @@ not permitted outside `jmlrpapers' environment}{}%
   \gdef\@shortauthor{}%
   \gdef\@shorttitle{}%
   \gdef\@firstauthor{}%
+  \gdef\@jmlr@authors{\@jmlrauthors}%
   \gdef\@jmlrauthors{}%
   \gdef\@firstsurname{}%
 }
@@ -4785,17 +4934,25 @@ not permitted outside `jmlrpapers' environment}{}%
     \def\@extra@b@citeb{#1}%
     \def\@extra@binfo{#1}%
     \def\jmlrmaketitlehook{%
+    \def\titlebreak{ }%
       \addtomaincontents{toc}%
-        {\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
+%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{changed \cs{@shorttitle} to \cs{@title}}
+%    \begin{macrocode}
+        {%
+          \protect\contentsline{papertitle}{\@title}{\thepage}%
 	   {page.\thepage}}%
 %    \end{macrocode}
 %\changes{1.09}{2010/12/01}{Added \cs{label} to \cs{jmlrmaketitlehook}}
 %    \begin{macrocode}
       \label{}%
-      \pdfbookmark{\@shorttitle}{chapter.\thechapter}%
+      \pdfbookmark{\@shorttitle}{chapter.\theHchapter}%
       \def\@jmlr@authors@sep{ \& }%
-      \tocchapterauthor{\@jmlrauthors}%
-      \@write@author{#1}{\@jmlrauthors}%
+%    \end{macrocode}
+%\changes{1.12}{2012/01/05}{changed \cs{@jmlrauthors} to \cs{@jmlr@authors}}
+%    \begin{macrocode}
+      \tocchapterauthor{\@jmlr@authors}%
+      \@write@author{#1}{\@jmlr@authors}%
       \jmlrpages{}%
       \jmlrvolume{}%
       \jmlryear{}%
@@ -4820,6 +4977,7 @@ not permitted outside `jmlrpapers' environment}{}%
   \gdef\@shortauthor{}%
   \gdef\@shorttitle{}%
   \gdef\@firstauthor{}%
+  \gdef\@jmlr@authors{\@jmlrauthors}%
   \gdef\@jmlrauthors{}%
   \gdef\@firstsurname{}%
 }
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
index 4764faedefd..45878ab8df9 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 0.94b 2011/3/24 21:20
+% jmlr.ins generated using makedtx version 0.94b 2012/1/5 12:59
 \input docstrip
 
 \preamble
 
  jmlr.dtx
- Copyright 2011 Nicola Talbot
+ Copyright 2012 Nicola Talbot
 
  This work may be distributed and/or modified under the
  conditions of the LaTeX Project Public License, either version 1.3