1 files changed, 114 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
index 9cd8d215ec9..88ee0c0be28 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"
-%   -doc "jmlr-manual.tex"
 %   -section "chapter"
-%   -author "Nicola Talbot"
 %   jmlr
-% Created on 2014/10/17 14:27
+% Created on 2015/2/24 9:38
 %\fi
 %\iffalse
 %<*package>
@@ -30,7 +30,7 @@
 %\fi
 % \iffalse
 % Doc-Source file to use with LaTeX2e
-% Copyright (C) 2014 Nicola Talbot, all rights reserved.
+% Copyright (C) 2015 Nicola Talbot, all rights reserved.
 % \fi
 % \iffalse
 %<*driver>
@@ -49,7 +49,7 @@
 
 \doxitem{Option}{option}{package options}
 
-\CheckSum{4791}
+\CheckSum{4945}
 
 
 \newcommand*{\appopt}[1]{\texttt{-{}-#1}}
@@ -67,7 +67,7 @@
 % \author{Nicola L. C. Talbot\\[10pt]
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2014-10-15 (version 1.20)}
+% \date{2015-02-24 (version 1.21)}
 % \maketitle
 %\tableofcontents
 %
@@ -1033,15 +1033,12 @@
 %\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex}
 %
 %There are also forums, mailing lists and newsgroups. For example,
+%\TeX\ on StackExchange (\url{http://tex.stackexchange.com/}),
 %the \LaTeX\ Community (\url{http://www.latex-community.org/}),
 %the \texttt{texhax} mailing list 
 %(\url{http://tug.org/mailman/listinfo/texhax}) and
 %\texttt{comp.text.tex} (archives available at
 %\url{http://groups.google.com/group/comp.text.tex/}).
-%The best place for queries about the \clsfmt{jmlr} class is the
-%\qt{Document Classes} section of the \LaTeX\ Community Forum, as
-%there's a high chance I'll see it there and help if I can. (Emails
-%directly to me tend to get lost in my overcrowded inbox.)
 %
 %Documentation for packages or classes can be found using the
 %\texttt{texdoc} application. For example:
@@ -1696,7 +1693,7 @@
 %\end{description}
 %
 %\StopEventually{\clearpage\phantomsection
-%  \addcontentsline{toc}{chapter}{Index}\PrintIndex
+%  \PrintIndex
 %}
 %
 %
@@ -1715,7 +1712,7 @@
 % Declare class and required TeX format:
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2014/10/15 v1.20 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2015/02/24 v1.21 (NLCT) Journal of Machine Learning Research]
 %    \end{macrocode}
 %\changes{1.10}{2011-01-05}{hyperref now loaded by jmlr instead of
 %jmlrbook}
@@ -2078,12 +2075,15 @@
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\thanks}
+%\changes{1.21}{2015-02-24}{added optional argument to \cs{footnotetext}}
 %\changes{1.10}{2011-01-05}{Modified definition of \cs{thanks}}
+%Added optional argument to \cs{footnotetext} as per 
+%\url{http://tex.stackexchange.com/questions/229295}.
 %    \begin{macrocode}
 \renewcommand*{\thanks}[1]{%
   \footnotemark
   \protected@xdef\@thanks{\@thanks 
-    \protect\footnotetext{#1}}%
+    \protect\footnotetext[\arabic{footnote}]{#1}}%
 }
 %    \end{macrocode}
 %\end{macro}
@@ -3252,11 +3252,20 @@ Keywords:} \ignorespaces}%
 \newcommand{\BlackBox}{\rule{1.5ex}{1.5ex}}
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\jmlrQED}
+%\changes{1.21}{2015-02-24}{new}
+%    \begin{macrocode}
+\newcommand*{\jmlrQED}{\hfill\BlackBox\\[2mm]}
+%    \end{macrocode}
+%\end{macro}
 %\begin{environment}{proof}
 % Proof environment
 %    \begin{macrocode}
-\newenvironment{proof}{\par\noindent{\bfseries\upshape
-  Proof\ }}{\hfill\BlackBox\\[2mm]}
+\newenvironment{proof}%
+{%
+ \par\noindent{\bfseries\upshape Proof\ }%
+}%
+{\jmlrQED}
 %    \end{macrocode}
 %\end{environment}
 %
@@ -3483,6 +3492,13 @@ Keywords:} \ignorespaces}%
 %    \end{macrocode}
 %\end{environment}
 %
+%\begin{macro}{\orgvec}
+%\changes{1.21}{2015-02-24}{new}
+%Keep a copy of original \cs{vec} in case it's wanted.
+%    \begin{macrocode}
+\let\orgvec\vec
+%    \end{macrocode}
+%\end{macro}
 %\begin{macro}{\vec}
 % Redefine \cs{vec} to produce a bold symbol
 %    \begin{macrocode}
@@ -4230,12 +4246,18 @@ Keywords:} \ignorespaces}%
    \ClassError{jmlr}{Package `amsthm' detected.\MessageBreak
     This package conflicts with the jmlr class}{}}{}%
   \@ifpackageloaded{pdfpages}{Package `pdfpages' detected.\MessageBreak
-   This can cause a problem for jmlrbook.}{}%
+   This can cause a problem for jmlrbook}{}%
   \@ifpackageloaded{geometry}{Package `geometry' detected.\MessageBreak
-   This can cause a problem for jmlrbook.}{}%
+   This can cause a problem for jmlrbook}{}%
   \@ifpackageloaded{tabularx}{%
    \ClassError{jmlr}{Package `tabularx' detected.\MessageBreak
-    This will break footnote links.}{}}{}%
+    This will break footnote links}{}}{}%
+%    \end{macrocode}
+%\changes{1.21}{2015-02-24}{Added check for jmlr2e package}
+%    \begin{macrocode}
+  \@ifpackageloaded{jmlr2e}{%
+   \ClassError{jmlr}{Package `jmlr2e' detected.\MessageBreak
+    This can't be used with the jmlr class}{}}{}%
 }
 \AtBeginDocument{%
 \@jmlr@check@packages
@@ -4311,6 +4333,72 @@ Keywords:} \ignorespaces}%
 }
 %    \end{macrocode}
 %\end{macro}
+%
+%\begin{macro}{\jmlrcheckforpseudocode}
+%\changes{1.21}{2015-02-24}{Added check for pseudocode package}
+% Check for \sty{pseudocode} package since it conflicts with
+% the \sty{algorithm} package and quite often both packages
+% are used in the same book or proceedings.
+%    \begin{macrocode}
+\providecommand*{\jmlrcheckforpseudocode}{%
+  \@ifpackageloaded{pseudocode}%
+  {%
+    \let\pseudoRETURN\RETURN
+    \let\pseudoTRUE\TRUE
+    \let\pseudoFALSE\FALSE
+    \let\pseudoAND\AND
+    \let\pseudoOR\OR
+    \let\pseudoNOT\NOT
+    \let\pseudoTO\TO
+    \let\pseudoCOMMENT\COMMENT
+    \let\pseudoIF\IF
+    \let\pseudoELSE\ELSE
+    \let\pseudoFOR\FOR
+    \let\pseudoFORALL\FORALL
+    \let\pseudoWHILE\WHILE
+    \let\pseudoREPEAT\REPEAT
+    \let\pseudoUNTIL\UNTIL
+    \let\pseudoENDFOR\ENDFOR
+    \let\RETURN\undefined
+    \let\TRUE\undefined
+    \let\FALSE\undefined
+    \let\AND\undefined
+    \let\OR\undefined
+    \let\NOT\undefined
+    \let\TO\undefined
+    \let\COMMENT\undefined
+    \let\IF\undefined
+    \let\ELSE\undefined
+    \let\FOR\undefined
+    \let\FORALL\undefined
+    \let\WHILE\undefined
+    \let\REPEAT\undefined
+    \let\UNTIL\undefined
+    \let\ENDFOR\undefined
+    \preto\pseudocode{%
+    \let\RETURN\pseudoRETURN
+    \let\TRUE\pseudoTRUE
+    \let\FALSE\pseudoFALSE
+    \let\AND\pseudoAND
+    \let\OR\pseudoOR
+    \let\NOT\pseudoNOT
+    \let\TO\pseudoTO
+    \let\COMMENT\pseudoCOMMENT
+    \let\IF\pseudoIF
+    \let\ELSE\pseudoELSE
+    \let\FOR\pseudoFOR
+    \let\FORALL\pseudoFORALL
+    \let\WHILE\pseudoWHILE
+    \let\REPEAT\pseudoREPEAT
+    \let\UNTIL\pseudoUNTIL
+    \let\ENDFOR\pseudoENDFOR
+    }%
+  }%
+  {}%
+}
+\jmlrcheckforpseudocode
+%    \end{macrocode}
+%\end{macro}
 %\iffalse
 %    \begin{macrocode}
 %</jmlr.cls>
@@ -4328,7 +4416,7 @@ Keywords:} \ignorespaces}%
 %    \end{macrocode}
 % Declare class:
 %    \begin{macrocode}
-\ProvidesClass{jmlrbook}[2014/10/15 v1.20 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2015/02/24 v1.21 (NLCT) JMLR Book Style]
 %    \end{macrocode}
 % Need \sty{xkeyval} package to have key=value class options
 %    \begin{macrocode}
@@ -4445,18 +4533,18 @@ Keywords:} \ignorespaces}%
 % Pass \clsopt{wcp} 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}
 %    \begin{macrocode}
 \DeclareOptionX{wcp}{%
   \PassOptionsToClass{\CurrentOption}{jmlr}%
-  \renewcommand*{\jmlrprefaceheader}{\chapter*{\prefacename}}
 }
 %    \end{macrocode}
 %\end{option}
 %\begin{option}{nowcp}
+%\changes{1.21}{2015-02-24}{No longer changes preface header}
 %    \begin{macrocode}
 \DeclareOptionX{nowcp}{%
   \PassOptionsToClass{\CurrentOption}{jmlr}%
-  \renewcommand*{\jmlrprefaceheader}{\chapter{\prefacename}}
 }
 %    \end{macrocode}
 %\end{option}
@@ -4805,8 +4893,6 @@ Keywords:} \ignorespaces}%
   \newenvironment{preface}[1][preface]%
   {%
 %    \end{macrocode}
-% The preface should be in the front matter, so the chapter
-% numbering should automatically be suppressed.
 %\changes{1.19}{2014/09/29}{changed to unstarred chapter}
 %    \begin{macrocode}
     \jmlrprefaceheader
@@ -5292,9 +5378,12 @@ Keywords:} \ignorespaces}%
     \fi
     \ifx\@editorialteam\@empty
     \else
-      \@editorialteam:\par\vskip\baselineskip
+%    \end{macrocode}
+%\changes{1.21}{2015-02-24}{added \cs{nopagebreak}}
+%    \begin{macrocode}
+      \@editorialteam:\nopagebreak\par\vskip\baselineskip
     \fi
-    \noindent\ignorespaces
+    \nopagebreak\noindent\ignorespaces
   }%
   {%
   }