jmlr (24feb15)

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

2 files changed, 77 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
index 159d891144b..ed2197b367a 100644
--- a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
+++ b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
@@ -7,7 +7,7 @@
 %% jmlr.dtx  (with options: `jmlr.cls,package')
 %% 
 %%  jmlr.dtx
-%%  Copyright 2014 Nicola Talbot
+%%  Copyright 2015 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -41,7 +41,7 @@
 %% First editor:
 %% Second editor:
 \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]
 \RequirePackage{xkeyval}
 \RequirePackage{calc}
 \RequirePackage{etoolbox}
@@ -195,7 +195,7 @@
 \renewcommand*{\thanks}[1]{%
   \footnotemark
   \protected@xdef\@thanks{\@thanks
-    \protect\footnotetext{#1}}%
+    \protect\footnotetext[\arabic{footnote}]{#1}}%
 }
 \ifjmlrhtml
   \renewenvironment{abstract}{\HCode{<h3>}Abstract\HCode{</h3>}}{}%
@@ -750,8 +750,12 @@ Keywords:} \ignorespaces}%
 \let\appendix\artappendix
 \newcommand{\booklinebreak}[1][]{}
 \newcommand{\BlackBox}{\rule{1.5ex}{1.5ex}}
-\newenvironment{proof}{\par\noindent{\bfseries\upshape
-  Proof\ }}{\hfill\BlackBox\\[2mm]}
+\newcommand*{\jmlrQED}{\hfill\BlackBox\\[2mm]}
+\newenvironment{proof}%
+{%
+ \par\noindent{\bfseries\upshape Proof\ }%
+}%
+{\jmlrQED}
 \newcommand*{\theorembodyfont}[1]{%
   \renewcommand*{\@theorembodyfont}{#1}%
 }
@@ -862,6 +866,7 @@ Keywords:} \ignorespaces}%
 \newtheorem{definition}[theorem]{Definition}
 \newtheorem{conjecture}[theorem]{Conjecture}
 \newtheorem{axiom}[theorem]{Axiom}
+\let\orgvec\vec
 \renewcommand*{\vec}[1]{\boldsymbol{#1}}
 \newenvironment{enumerate*}%
 {%
@@ -1279,12 +1284,15 @@ 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}{}}{}%
+  \@ifpackageloaded{jmlr2e}{%
+   \ClassError{jmlr}{Package `jmlr2e' detected.\MessageBreak
+    This can't be used with the jmlr class}{}}{}%
 }
 \AtBeginDocument{%
 \@jmlr@check@packages
@@ -1316,6 +1324,63 @@ Keywords:} \ignorespaces}%
 \renewcommand*{\tt}{%
   \obsoletefontcs{tt}%
 }
+\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
 \endinput
 %%
 %% End of file `jmlr.cls'.
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
index 9bf6963244f..932c1c41420 100644
--- a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
+++ b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
@@ -7,7 +7,7 @@
 %% jmlr.dtx  (with options: `jmlrbook.cls,package')
 %% 
 %%  jmlr.dtx
-%%  Copyright 2014 Nicola Talbot
+%%  Copyright 2015 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -41,7 +41,7 @@
 %% First editor:
 %% Second editor:
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlrbook}[2014/10/15 v1.20 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2015/02/24 v1.21 (NLCT) JMLR Book Style]
 \RequirePackage{xkeyval}
 \RequirePackage{setspace}
 \newcommand*\jmlrprefacepath{}
@@ -80,11 +80,9 @@
 }
 \DeclareOptionX{wcp}{%
   \PassOptionsToClass{\CurrentOption}{jmlr}%
-  \renewcommand*{\jmlrprefaceheader}{\chapter*{\prefacename}}
 }
 \DeclareOptionX{nowcp}{%
   \PassOptionsToClass{\CurrentOption}{jmlr}%
-  \renewcommand*{\jmlrprefaceheader}{\chapter{\prefacename}}
 }
 \DeclareOptionX{tablecaptiontop}{\PassOptionsToClass{\CurrentOption}{jmlr}}
 \DeclareOptionX{tablecaptionbottom}{\PassOptionsToClass{\CurrentOption}{jmlr}}
@@ -552,9 +550,9 @@
     \fi
     \ifx\@editorialteam\@empty
     \else
-      \@editorialteam:\par\vskip\baselineskip
+      \@editorialteam:\nopagebreak\par\vskip\baselineskip
     \fi
-    \noindent\ignorespaces
+    \nopagebreak\noindent\ignorespaces
   }%
   {%
   }