2 files changed, 79 insertions, 75 deletions
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
index 3f8f8151f2a..0b627dc3405 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 2010 Nicola Talbot
+%%  Copyright 2011 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -41,32 +41,41 @@
 %% First editor:
 %% Second editor:
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2010/12/01 v1.09 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2011/01/05 v1.10 (NLCT) Journal of Machine Learning Research]
+\RequirePackage{xkeyval}
+\providecommand*{\jmlr@prehyperref}{}
+\define@key{jmlr.cls}{prehyperref}{%
+  \renewcommand*{\jmlr@prehyperref}{#1}}
 \newif\if@openright
 \newif\if@mainmatter \@mainmattertrue
 \@ifundefined{ifgrayscale}{
   \newif\ifgrayscale
   \grayscalefalse
 }{}
-\DeclareOption{color}{\grayscalefalse
+\DeclareOptionX{color}{\grayscalefalse
   \PassOptionsToPackage{color}{xcolor}}
-\DeclareOption{gray}{\grayscaletrue
+\DeclareOptionX{gray}{\grayscaletrue
   \PassOptionsToPackage{gray}{xcolor}}
 \newif\iftablecaptiontop
 \tablecaptiontoptrue
-\DeclareOption{tablecaptiontop}{\tablecaptiontoptrue}
-\DeclareOption{tablecaptionbottom}{\tablecaptionbottomtrue}
+\DeclareOptionX{tablecaptiontop}{\tablecaptiontoptrue}
+\DeclareOptionX{tablecaptionbottom}{\tablecaptiontopfalse}
+
+\define@choicekey{jmlr.cls}{tablecaption}[\val\nr]{top,bottom}{%
+  \ifcase\nr\relax
+    \tablecaptiontoptrue
+  \or
+    \tablecaptiontopfalse
+  \fi
+}
 \newif\ifjmlrhtml
 \jmlrhtmlfalse
-\DeclareOption{html}{\jmlrhtmltrue}
-\DeclareOption{nohtml}{\jmlrhtmlfalse}
+\DeclareOptionX{html}{\jmlrhtmltrue}
+\DeclareOptionX{nohtml}{\jmlrhtmlfalse}
 \def\pt@size{11pt}
-\DeclareOption{10pt}{\renewcommand{\pt@size}{10}%
-  \PassOptionsToClass{\CurrentOption}{article}}
-\DeclareOption{11pt}{\renewcommand{\pt@size}{11}%
-  \PassOptionsToClass{\CurrentOption}{article}}
-\DeclareOption{12pt}{\renewcommand{\pt@size}{12}%
-  \PassOptionsToClass{\CurrentOption}{article}}
+\DeclareOptionX{10pt}{\renewcommand{\pt@size}{10pt}}
+\DeclareOptionX{11pt}{\renewcommand{\pt@size}{11pt}}
+\DeclareOptionX{12pt}{\renewcommand{\pt@size}{12pt}}
 \newcommand*{\@jmlrproceedings}{Journal of Machine Learning Research}
 \newcommand*{\@jmlrabbrvproceedings}{JMLR}
 \newcommand*{\jmlrproceedings}[2]{%
@@ -79,16 +88,16 @@
 \newcommand*{\jmlrwcp}{%
   \jmlrproceedings{JMLR WC\&P}{JMLR: Workshop and Conference Proceedings}%
 }
-\DeclareOption{nowcp}{\jmlrnowcp}
-\DeclareOption{wcp}{\jmlrwcp}
+\DeclareOptionX{nowcp}{\jmlrnowcp}
+\DeclareOptionX{wcp}{\jmlrwcp}
 \newif\ifviiXx
 \viiXxfalse
-\DeclareOption{7x10}{\viiXxtrue}
-\DeclareOption{letterpaper}{\PassOptionsToPackage{letterpaper}{typearea}}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+\DeclareOptionX{7x10}{\viiXxtrue}
+\DeclareOptionX{letterpaper}{\PassOptionsToPackage{letterpaper}{typearea}}
+\DeclareOptionX*{\PassOptionsToClass{\CurrentOption}{article}}
 \ExecuteOptions{twoside,letterpaper}
-\ProcessOptions
-\LoadClass{article}
+\ProcessOptionsX
+\LoadClass[\pt@size]{article}
 \ifviiXx
   \setlength{\paperwidth}{7in}
   \setlength{\paperheight}{10in}
@@ -110,6 +119,7 @@
   \setlength{\textheight}{8.5 true in}
   \setlength{\textwidth}{6.0 true in}
 \fi
+\AtEndDocument{\@jmlrenddoc}
 \RequirePackage{amsmath}
 \RequirePackage{amssymb}
 \RequirePackage{natbib}
@@ -117,6 +127,17 @@
 \RequirePackage{url}
 \RequirePackage[x11names]{xcolor}
 \RequirePackage[algo2e,ruled]{algorithm2e}
+\jmlr@prehyperref
+\usepackage[colorlinks,
+            linkcolor=blue,
+            citecolor=blue,
+            urlcolor=magenta,
+            linktocpage,
+            plainpages=false]{hyperref}
+\usepackage{nameref}
+\ifgrayscale
+  \hypersetup{draft}
+\fi
 \renewcommand{\topfraction}{0.95} % let figure take up nearly whole page
 \renewcommand{\textfraction}{0.05} % let figure take up nearly whole page
 \widowpenalty=10000\relax
@@ -154,9 +175,24 @@
   \csname pre#1num\endcsname
   \csname the#1\endcsname.\enskip
 }
-\long\def\@makefntext#1{\@setpar{\@@par\@tempdima \hsize
-             \advance\@tempdima-15pt\parshape \@ne 15pt \@tempdima}\par
-             \parindent 2em\noindent \hbox to \z@{\hss{\@thefnmark}. \hfil}#1}
+\renewcommand*{\@makefntext}[1]{%
+  \@setpar
+  {%
+    \@@par
+    \@tempdima\hsize
+    \advance \@tempdima -15pt\relax
+    \parshape \@ne 15pt \@tempdima
+  }%
+  \par
+  \parindent 2em\noindent
+  \hbox to \z@ {\hss {\@thefnmark }\footnoteseptext\hfil }#1%
+}
+\newcommand*{\footnoteseptext}{. }
+\renewcommand*{\thanks}[1]{%
+  \footnotemark
+  \protected@xdef\@thanks{\@thanks
+    \protect\footnotetext{#1}}%
+}
 \ifjmlrhtml
   \renewenvironment{abstract}{\HCode{<h3>}Abstract\HCode{</h3>}}{}%
 \else
@@ -197,19 +233,6 @@ Keywords:} \ignorespaces}%
 \newcommand*{\@firstauthor}{}
 \newcommand*{\@firstsurname}{}
 \newlength\jmlrlength
-\renewcommand*{\@makefntext}[1]{%
-  \@setpar
-  {%
-    \@@par
-    \@tempdima\hsize
-    \advance \@tempdima -15pt\relax
-    \parshape \@ne 15pt \@tempdima
-  }%
-  \par
-  \parindent 2em\noindent
-  \hbox to \z@ {\hss {\@thefnmark }\footnoteseptext\hfil }#1%
-}
-\newcommand*{\footnoteseptext}{. }
 \def\jmlrmaketitle{%
  \jmlrpremaketitlehook
  \def\@jmlr@authors@sep{, }%
@@ -240,7 +263,7 @@ Keywords:} \ignorespaces}%
 \thispagestyle{jmlrtps}%
 \setcounter{footnote}{0}%
 \let\maketitle\relax \let\@maketitle\relax
-\gdef\@thanks{}\gdef\@author{}\let\thanks\relax
+\gdef\@thanks{}\gdef\@author{}\let\thanks\@gobble
 \def\@jmlr@authors@sep{ \& }%
 }
 \newcommand*{\jmlrmaketitlehook}{}
@@ -270,7 +293,7 @@ Keywords:} \ignorespaces}%
 \bgroup
   \def\nametag##1{##1}%
   \def\and{\unskip\enspace{\normalfont and}\enspace}%
-  \def\addr{\small\itshape}%
+  \def\addr{\mdseries\small\itshape}%
   \def\name{\ClassError{jmlr}{Use \string\Name{Author's Name} not \string\name}{}}%
   \def\email{\ClassError{jmlr}{Use \string\Email{address} not \string\email}{}}%
   \def\AND{\@endauthor\normalfont\hss \vskip \interauthorskip
@@ -363,11 +386,11 @@ Keywords:} \ignorespaces}%
   \gdef\@editor{#1}%
 }
 \def\firstpageno#1{\setcounter{page}{#1}}
-\AtEndDocument{\@jmlrenddoc}
+\@ifundefined{startpage}{}{\firstpageno{\startpage}}
 \newcommand*{\@jmlrenddoc}{%
-  \@ifundefined{phantomsection}{}{\phantomsection}%
+  \phantomsection
   \protected@edef\@currentlabelname{end of \@shorttitle}%
-  \label{jmlrend}%
+  \label{jmlrend}\null
   \global\let\@reprint\@empty
 }
 \newcommand*{\@titlefoot}{\scriptsize\copyright\space\@jmlryear
@@ -626,6 +649,7 @@ Keywords:} \ignorespaces}%
   \setcounter{section}{0}
   \setcounter{subsection}{0}
   \def\thesection{\Alph{section}}
+  \def\theHsection{\Alph{section}}
   \def\presectionnum{Appendix~}%
 }
 \let\appendix\artappendix
@@ -677,7 +701,6 @@ Keywords:} \ignorespaces}%
 \newcounter{subfigure}
 \@addtoreset{subfigure}{figure}
 \renewcommand*{\thesubfigure}{\alph{subfigure}}
-\newcommand*{\theHsubfigure}{\theHfigure.\alph{subfigure}}
 \renewcommand*{\p@subfigure}{\expandafter\@p@subfigure}
 \newcommand*{\@p@subfigure}[1]{%
   \protect\@subfigurelabel{\thefigure}{\thesubfigure}%
@@ -814,8 +837,8 @@ Keywords:} \ignorespaces}%
 \let\chapter\artchapter
 \def\@chaptoclabel{chapter}
 \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
+                       \refstepcounter{chapter}%
                        \if@mainmatter
-                         \refstepcounter{chapter}%
                          \typeout{\@chapapp\space\thechapter.}%
                          \addcontentsline{toc}{\@chaptoclabel}%
                                    {\protect\numberline{\thechapter}#1}%
@@ -892,6 +915,7 @@ Keywords:} \ignorespaces}%
 \newcommand\frontmatter{%
   \cleardoublepage
   \@mainmatterfalse
+  \renewcommand*{\theHchapter}{front-\thechapter}%
   \pagenumbering{roman}%
   \morefrontmatter
 }
@@ -899,6 +923,8 @@ Keywords:} \ignorespaces}%
 \newcommand\mainmatter{%
   \cleardoublepage
   \@mainmattertrue
+  \setcounter{chapter}{0}%
+  \renewcommand*{\theHchapter}{\thechapter}%
   \pagenumbering{arabic}%
   \moremainmatter
 }
@@ -925,6 +951,7 @@ Keywords:} \ignorespaces}%
 }
 \let\arttableofcontents\tableofcontents
 \newcommand{\artpart}{%
+  \def\toclevel@part{0}%
   \if@noskipsec \leavevmode\fi
   \par
   \addvspace{4ex}%
@@ -934,6 +961,7 @@ Keywords:} \ignorespaces}%
 \let\@artpart\@part
 \let\@sartpart\@spart
 \newcommand\bookpart{%
+  \def\toclevel@part{-1}%
   \if@openright
     \cleardoublepage
   \else
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
index 4dc4c64e7d3..0a67946d173 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 2010 Nicola Talbot
+%%  Copyright 2011 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -41,11 +41,11 @@
 %% First editor:
 %% Second editor:
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlrbook}[2010/12/01 v1.09 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2011/01/05 v1.10 (NLCT) JMLR Book Style]
 \RequirePackage{xkeyval}
-\newcommand*{\@prehyperref}{}
+\newcommand*{\jmlr@prehyperref}{}
 \define@key{jmlrbook.cls}{prehyperref}{%
-  \renewcommand*{\@prehyperref}{#1}}
+  \renewcommand*{\jmlr@prehyperref}{#1}}
 \newif\ifgrayscale
 \grayscalefalse
 \DeclareOptionX{color}{\grayscalefalse}
@@ -58,6 +58,9 @@
 \DeclareOptionX{nowcp}{\PassOptionsToClass{\CurrentOption}{jmlr}}
 \DeclareOptionX{tablecaptiontop}{\PassOptionsToClass{\CurrentOption}{jmlr}}
 \DeclareOptionX{tablecaptionbottom}{\PassOptionsToClass{\CurrentOption}{jmlr}}
+\DeclareOptionX{10pt}{\PassOptionsToClass{\CurrentOption}{jmlr}}
+\DeclareOptionX{11pt}{\PassOptionsToClass{\CurrentOption}{jmlr}}
+\DeclareOptionX{12pt}{\PassOptionsToClass{\CurrentOption}{jmlr}}
 \ProcessOptionsX
 \@ifundefined{jmlrgrayscale}{}%
 {%
@@ -87,17 +90,6 @@
      \expandafter\NAT@parse@date\NAT@date??????@@%
      \ifciteindex\NAT@index\fi}
 \RequirePackage{setspace}
-\@prehyperref
-\usepackage[colorlinks,
-            linkcolor=blue,
-            citecolor=blue,
-            urlcolor=magenta,
-            linktocpage,
-            plainpages=false]{hyperref}
-\usepackage{nameref}
-\ifgrayscale
-  \hypersetup{draft}
-\fi
 \@twosidetrue
 \newif\if@openright
 \@openrighttrue
@@ -791,22 +783,6 @@ not permitted outside `jmlrpapers' environment}{}%
   }%
 }
 \renewcommand*\bibsection{\section*{\refname}}
-\def\@bookpart[#1]#2{%
-    \ifnum \c@secnumdepth >-2\relax
-      \refstepcounter{part}%
-      \addcontentsline{toc}{\@parttoclabel}{%
-        \protect\numberline{\thepart}#1}%
-    \else
-      \addcontentsline{toc}{\@parttoclabel}{#1}%
-    \fi
-    \markboth{}{}%
-    {\interlinepenalty \@M
-     \normalfont\partformat
-     \ifnum \c@secnumdepth >-2\relax
-       \partnumberformat{\thepart}%
-     \fi
-     \parttitleformat{#2}\par}%
-    \postparthook}
 \jmlrbookcommands
 \endinput
 %%