summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-12-02 01:14:48 +0000
committerKarl Berry <karl@freefriends.org>2010-12-02 01:14:48 +0000
commitcf902eaabacb3ba258a35e8e461a2315c35d59e8 (patch)
treefad1e3dd42075ecd697cf3949196e447d509b359 /Master
parent0f2a338755c61f4f03c87894c1fb0fc55e248f85 (diff)
jmlr 1.09 (1dec10)
git-svn-id: svn://tug.org/texlive/trunk@20630 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/CHANGES29
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/README4
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/jmlr-manual.html4
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/jmlr-manual.tex2
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/jmlr-manual0x.pngbin487 -> 487 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/jmlr-manual1x.pngbin573 -> 573 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/jmlr-manual2x.pngbin480 -> 480 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/jmlr-manual3x.pngbin576 -> 576 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/jmlr.pdfbin687065 -> 686791 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex23
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex9
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.dtx393
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.ins2
-rw-r--r--Master/texmf-dist/tex/latex/jmlr/jmlr.cls150
-rw-r--r--Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls90
15 files changed, 545 insertions, 161 deletions
diff --git a/Master/texmf-dist/doc/latex/jmlr/CHANGES b/Master/texmf-dist/doc/latex/jmlr/CHANGES
index 2ca02802016..d4c5ca52054 100644
--- a/Master/texmf-dist/doc/latex/jmlr/CHANGES
+++ b/Master/texmf-dist/doc/latex/jmlr/CHANGES
@@ -1,3 +1,32 @@
+v1.09:
+
+ jmlr.cls
+
+ * now loads article.cls instead of scrartcl.cls
+
+ * Fixed sub-captions so that they don't exceed the width of the
+ sub-figure/table to which they refer.
+
+ * added \nametag, \reprint, \algocfconts, \theHsubfigure,
+ \booktocpreamble, \@partapp.
+
+ * Made \objectref robust
+
+ jmlrbook.cls
+
+ * Reset start and end document hook to avoid problems caused by
+ defining duplicate commands.
+
+ * Moved redefinition of \jmlrpremaketitlehook outside of import
+ macros.
+
+ * Moved \refstepcounter from \jmlrmaketitlehook to
+ \jmlrpremaketitlehook
+
+ * Added \jmlrimporthook
+
+ * Added \label to \jmlrmaketitlehook
+
v1.08:
* Fixed \thanks so that the footnote symbol is raised and isn't
diff --git a/Master/texmf-dist/doc/latex/jmlr/README b/Master/texmf-dist/doc/latex/jmlr/README
index 52e1ecb31ab..20e8945a2dd 100644
--- a/Master/texmf-dist/doc/latex/jmlr/README
+++ b/Master/texmf-dist/doc/latex/jmlr/README
@@ -1,6 +1,6 @@
-LaTeX Class : jmlr bundle v1.08
+LaTeX Class : jmlr bundle v1.09
-Last Modified : 2010-07-27
+Last Modified : 2010-12-01
Author : Nicola L. C. Talbot
diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual.html b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual.html
index 71bdd72182d..25eab0b9f0c 100644
--- a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual.html
+++ b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual.html
@@ -11,7 +11,7 @@
<meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" />
<!-- xhtml,fn-in,css-in -->
<meta name="src" content="jmlr-manual.tex" />
-<meta name="date" content="2010-07-27 11:49:00" />
+<meta name="date" content="2010-12-01 14:29:00" />
<style type="text/css">
<!--
@@ -347,7 +347,7 @@ class="ecrm-1200">Nicola L. C. Talbot</span>
href="http://theoval.cmp.uea.ac.uk/~nlct/" class="url" ><span
class="ectt-1200">http://theoval.cmp.uea.ac.uk/~nlct/</span></a></div><br />
<div class="date" ><span
-class="ecrm-1200">2010-07-27 (version 1.08)</span></div>
+class="ecrm-1200">2010-12-01 (version 1.09)</span></div>
</div>
<h3 class="likesectionHead"><a
id="x1-1000"></a>Contents</h3>
diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual.tex b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual.tex
index cdf6e49d9b1..5f96fb53dfa 100644
--- a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual.tex
+++ b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual.tex
@@ -23,7 +23,7 @@ Learning Research}
\author{Nicola L. C. Talbot\\[10pt]
\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
- \date{2010-07-27 (version 1.08)}
+ \date{2010-12-01 (version 1.09)}
\maketitle
\tableofcontents
diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual0x.png b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual0x.png
index 4141633e401..1796a0fe5ce 100644
--- a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual0x.png
+++ b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual0x.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual1x.png b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual1x.png
index bf6fe59d55f..1583a1b5f5b 100644
--- a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual1x.png
+++ b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual1x.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual2x.png b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual2x.png
index 7a6a668a1f0..0a154c2dcdf 100644
--- a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual2x.png
+++ b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual2x.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual3x.png b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual3x.png
index a96b40054d6..39d232819fe 100644
--- a/Master/texmf-dist/doc/latex/jmlr/jmlr-manual3x.png
+++ b/Master/texmf-dist/doc/latex/jmlr/jmlr-manual3x.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
index 3d62246a037..d10fd27350a 100644
--- a/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
index 107883ec906..9cccc51024a 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
@@ -1,5 +1,5 @@
%\documentclass[gray]{jmlr} % test grayscale version
-\documentclass{jmlr}
+\documentclass[tablecaptiontop]{jmlr}
% The following packages will be automatically loaded:
% amsmath, amssymb, natbib, graphicx, url, algorithm2e
@@ -14,6 +14,7 @@
% The siunitx package is used by this sample document
% to align numbers in a column by their decimal point.
% Remove the next line if you don't require it.
+%\usepackage[load-configurations=version-1]{siunitx} % newer version
\usepackage{siunitx}
% The following command is just for this sample document:
@@ -535,7 +536,10 @@ For example, see \algorithmref{alg:gauss}. Note that algorithms
float like figures and tables.
\begin{algorithm}[htbp]
-\caption{The Gauss-Seidel Algorithm}\label{alg:gauss}
+\floatconts
+ {alg:gauss}%
+ {\caption{The Gauss-Seidel Algorithm}}%
+{%
\begin{enumerate}
\item For $k=1$ to maximum number of iterations
\begin{enumerate}
@@ -549,6 +553,7 @@ float like figures and tables.
\end{enumerate}
\end{enumerate}
\end{enumerate}
+}%
\end{algorithm}
If you'd rather have the same numbering throughout the algorithm
@@ -558,7 +563,10 @@ but still want the convenient indentation of nested
class. For example, see \algorithmref{alg:moore}.
\begin{algorithm}
-\caption{Moore's Shortest Path}\label{alg:moore}
+\floatconts
+ {alg:moore}%
+ {\caption{Moore's Shortest Path}}%
+{%
Given a connected graph $G$, where the length of each edge is 1:
\begin{enumerate*}
\item Set the label of vertex $s$ to 0
@@ -577,6 +585,7 @@ Given a connected graph $G$, where the length of each edge is 1:
\end{enumerate*}
\end{enumerate*}
\end{enumerate*}
+}%
\end{algorithm}
Pseudo code can be displayed using the \texttt{algorithm2e}
@@ -589,8 +598,12 @@ For an example, see \algorithmref{alg:net}.
\begin{algorithm2e}
\caption{Computing Net Activation}
\label{alg:net}
-\dontprintsemicolon
-\linesnumbered
+% older versions of algorithm2e have \dontprintsemicolon instead
+% of the following:
+%\DontPrintSemicolon
+% older versions of algorithm2e have \linesnumbered instead of the
+% following:
+%\LinesNumbered
\KwIn{$x_1, \ldots, x_n, w_1, \ldots, w_n$}
\KwOut{$y$, the net activation}
$y\leftarrow 0$\;
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
index 107d12061c3..ca4f1a5e392 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
@@ -14,6 +14,7 @@
% The siunitx package is used by this sample document
% to align numbers in a column by their decimal point.
% Remove the next line if you don't require it.
+%\usepackage[load-configurations=version-1]{siunitx} % newer version
\usepackage{siunitx}
% The following command is just for this sample document:
@@ -585,8 +586,12 @@ For an example, see \algorithmref{alg:net}.
\begin{algorithm2e}
\caption{Computing Net Activation}
\label{alg:net}
-\dontprintsemicolon
-\linesnumbered
+% older versions of algorithm2e have \dontprintsemicolon instead
+% of the following:
+%\DontPrintSemicolon
+% older versions of algorithm2e have \linesnumbered instead of the
+% following:
+%\LinesNumbered
\KwIn{$x_1, \ldots, x_n, w_1, \ldots, w_n$}
\KwOut{$y$, the net activation}
$y\leftarrow 0$\;
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
index fbec9c7a355..b520db4de28 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 2010/7/27 11:45
+% Created on 2010/12/1 14:29
%\fi
%\iffalse
%<*package>
@@ -63,7 +63,7 @@
% \author{Nicola L. C. Talbot\\[10pt]
%\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
%
-% \date{2010-07-27 (version 1.08)}
+% \date{2010-12-01 (version 1.09)}
% \maketitle
%\tableofcontents
%
@@ -1523,7 +1523,7 @@
% Declare class and required TeX format:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2010/07/27 v1.08 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2010/12/01 v1.09 (NLCT) Journal of Machine Learning Research]
% \end{macrocode}
% The following conditionals are provided to make this class play nicely
% with combine and aren't required for articles.
@@ -1624,9 +1624,9 @@
\DeclareOption{7x10}{\viiXxtrue}
\DeclareOption{letterpaper}{\PassOptionsToPackage{letterpaper}{typearea}}
% \end{macrocode}
-% Pass all remaining options to \cls{scrartcl} class:
+% Pass all remaining options to \cls{article} class:
% \begin{macrocode}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
% \end{macrocode}
% Execute required options:
% \begin{macrocode}
@@ -1638,7 +1638,7 @@
% \end{macrocode}
% Load \cls{scrartcl} class
% \begin{macrocode}
-\LoadClass[pointednumbers,normalheadings]{scrartcl}
+\LoadClass{article}
% \end{macrocode}
% Can't use \sty{geometry} package because it doesn't play nicely
% with the \cls{combine} class.
@@ -1703,18 +1703,62 @@
\bibpunct{(}{)}{;}{a}{,}{,}
% \end{macrocode}
%\subsection{Sections}
+%\begin{macro}{\section}
% \begin{macrocode}
-\addtokomafont{section}{\rmfamily\large}
-\addtokomafont{subsection}{\rmfamily\normalsize}
-\addtokomafont{subsubsection}{\rmfamily\mdseries\normalsize\scshape}
-\addtokomafont{paragraph}{\rmfamily\normalsize}
-\addtokomafont{subparagraph}{\rmfamily\itshape\normalsize}
+\renewcommand{\section}{\@startsection{section}{1}{\z@}%
+ {-0.24in \@plus -1ex \@minus -.2ex}%
+ {0.10in \@plus.2ex}%
+ {\normalfont\rmfamily\bfseries\large\raggedright}%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\subsection}
+% \begin{macrocode}
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+ {-0.20in \@plus -1ex \@minus -.2ex}%
+ {0.08in \@plus .2ex}%
+ {\normalfont\rmfamily\bfseries\normalsize\raggedright}%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\subsubsection}
+% \begin{macrocode}
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-0.18in \@plus -1ex \@minus -.2ex}%
+ {0.08in \@plus .2ex}%
+ {\normalfont\normalsize\rmfamily\mdseries\scshape\raggedright}%
+}
% \end{macrocode}
-% Insert possible prefix to section number.
+%\end{macro}
+%\begin{macro}{\paragraph}
+% \begin{macrocode}
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {1.5ex plus 0.5ex minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\rmfamily\bfseries}%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\subparagraph}
+% \begin{macrocode}
+\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\z@}%
+ {1.5ex plus 0.5ex minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\rmfamily\bfseries\itshape}}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@seccntformat}
+% Redefine the way the section number appears in the section
+% heading.
% \begin{macrocode}
-\renewcommand*{\othersectionlevelsformat}[1]{%
- \csname pre#1num\endcsname\csname the#1\endcsname\autodot\enskip}
+\renewcommand*\@seccntformat[1]{%
+ \csname pre#1num\endcsname
+ \csname the#1\endcsname.\enskip
+}
% \end{macrocode}
+%\end{macro}
+%
%\subsection{Footnotes}
% This code has been taken from jmlr2e.sty
% \begin{macrocode}
@@ -1731,7 +1775,11 @@
\renewenvironment{abstract}{\HCode{<h3>}Abstract\HCode{</h3>}}{}%
\else
\renewenvironment{abstract}
- {\centerline{\large\bfseries Abstract}\vspace{0.7ex}%
+% \end{macrocode}
+%\changes{1.09}{2010/12/01}{changed \cs{centerline} to
+%\cs{centering}\ldots\cs{par}}
+% \begin{macrocode}
+ {{\centering\large\bfseries Abstract\par}\vspace{0.7ex}%
\bgroup
\leftskip 20pt\rightskip 20pt\small\noindent\ignorespaces}%
{\par\egroup\vskip 0.25ex}
@@ -1961,10 +2009,18 @@ Keywords:} \ignorespaces}%
\def\jmlrposttitle{\par\end{center}\vskip\aftertitskip}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\nametag}
+%\changes{1.09}{2010/12/01}{new}
+% \begin{macrocode}
+\newcommand*{\nametag}[1]{}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\jmlrpreauthor}
+%\changes{1.09}{2010/12/01}{added \cs{nametag}}
% \begin{macrocode}
\def\jmlrpreauthor{%
\bgroup
+ \def\nametag##1{##1}%
\def\and{\unskip\enspace{\normalfont and}\enspace}%
\def\addr{\small\itshape}%
\def\name{\ClassError{jmlr}{Use \string\Name{Author's Name} not \string\name}{}}%
@@ -1990,13 +2046,13 @@ Keywords:} \ignorespaces}%
% Parse a name. Appends forename to \cs{@forenames} and stores
% surname in \cs{@surname}.
% \begin{macrocode}
-\def\@parsename#1 #2\@nil{%
+\def\@parsename#1 #2\end@parsename{%
\def\@tmp{#2}%
- \ifx\@tmp\@empty
+ \ifx\@tmp\@nnil
\def\@surname{#1}%
\let\@nextparsename\@parsenamenoop
\else
- \@getinitial#1-\relax\relax\end
+ \@getinitial#1-\relax\relax\end@getinitial
\ifx\@forenames\@empty
\def\@forenames{#1}%
\protected@edef\@initials{\@initial}%
@@ -2008,15 +2064,15 @@ Keywords:} \ignorespaces}%
\fi
\let\@nextparsename\@parsename
\fi
- \@nextparsename#2\@nil
+ \@nextparsename#2\end@parsename
}
-\def\@parsenamenoop#1\@nil{}
+\def\@parsenamenoop#1\end@parsename{}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\@getinitial}
% \begin{macrocode}
-\def\@getinitial#1#2-#3#4\end{%
+\def\@getinitial#1#2-#3#4\end@getinitial{%
\def\@jmlr@tmp{#3}%
\if\@jmlr@tmp\relax
\def\@initial{#1.}%
@@ -2035,7 +2091,8 @@ Keywords:} \ignorespaces}%
\newcommand*{\Name}[1]{%
\def\@forenames{}%
\def\@surname{}%
- \@parsename#1 \@nil
+ \def\nametag##1{}%
+ \@parsename#1 \@nil\end@parsename
\ifx\@shortauthor\@empty
\ifx\@sauthor\@empty
\global\let\@shortauthor\@surname
@@ -2052,6 +2109,7 @@ Keywords:} \ignorespaces}%
\noexpand\@jmlr@authors@sep
\@initials\space\@surname}%
\fi
+ \def\nametag##1{##1}%
\@name #1%
}
% \end{macrocode}
@@ -2149,17 +2207,35 @@ Keywords:} \ignorespaces}%
%
% Label end page.
% \begin{macrocode}
-\AtEndDocument{%
+\AtEndDocument{\@jmlrenddoc}
+% \end{macrocode}
+%\begin{macro}{\@jmlrenddoc}
+% Label end page
+% \begin{macrocode}
+\newcommand*{\@jmlrenddoc}{%
\@ifundefined{phantomsection}{}{\phantomsection}%
\protected@edef\@currentlabelname{end of \@shorttitle}%
\label{jmlrend}%
+ \global\let\@reprint\@empty
}
% \end{macrocode}
+%\end{macro}
%
%\begin{macro}{\@titlefoot}
+%\changes{1.09}{2010/12/01}{added \cs{@reprint}}
% \begin{macrocode}
\newcommand*{\@titlefoot}{\scriptsize\copyright\space\@jmlryear
- \space\@jmlrauthors.\hfill}
+ \space\@jmlrauthors.\hfill
+ \@reprint
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\reprint}
+%\changes{1.09}{2010/12/01}{new}
+% \begin{macrocode}
+\let\@reprint\@empty
+\newcommand{\reprint}[1]{%
+ \gdef\@reprint{Reprinted with permission for JMLR#1}}
% \end{macrocode}
%\end{macro}
%
@@ -2402,7 +2478,7 @@ Keywords:} \ignorespaces}%
% e.g.\ an opening bracket, and the fifth argument is text
% to go after the reference number, e.g.\ a closing bracket.
% \begin{macrocode}
-\newcommand*{\objectref}[5]{%
+\DeclareRobustCommand*{\objectref}[5]{%
\let\@objectname\@empty
\def\@objectref{}%
\let\@prevsep\@empty
@@ -2549,6 +2625,16 @@ Keywords:} \ignorespaces}%
}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\algocfconts}
+%\changes{1.09}{2010/12/01}{new}
+% \begin{macrocode}
+\newcommand{\algocfconts}[3]{%
+ \@algocf@pre@ruled
+ #2\label{#1}\kern2pt\hrule height.8pt depth0pt\kern2pt%
+ #3\@algocf@pre@ruled
+}
+% \end{macrocode}
+%\end{macro}
%
%\begin{macro}{\includeteximage}
% Provide a command like \cs{includegraphics} that includes a
@@ -2625,19 +2711,19 @@ Keywords:} \ignorespaces}%
%
% The \env{algorithm} environment should float like a figure or table.
% It should use the same counter as the \env{algorithm2e} environment.
+%\changes{1.09}{2010/12/01}{caption set up so that it doesn't use a
+%box}
% \begin{macrocode}
\newenvironment{algorithm}[1][htbp]%
{%
- \@algocf@init%
- \@algocf@init@caption
\begin{algocf}[#1]%
- \@algocf@start%
+ \renewcommand\@makecaption[2]{%
+ \hskip\AlCapHSkip
+ \parbox[t]{\hsize}{\algocf@captiontext{##1}{##2}}%
+ }%
}%
{%
- \@algocf@finish%
- \@algocf@term@caption
\end{algocf}%
- \@algocf@term
}
% \end{macrocode}
%
@@ -2799,6 +2885,12 @@ Keywords:} \ignorespaces}%
\renewcommand*{\thesubfigure}{\alph{subfigure}}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\theHsubfigure}
+%\changes{1.09}{2010/12/01}{new}
+% \begin{macrocode}
+\newcommand*{\theHsubfigure}{\theHfigure.\alph{subfigure}}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\p@subfigure}
% \begin{macrocode}
\renewcommand*{\p@subfigure}{\expandafter\@p@subfigure}
@@ -2849,6 +2941,19 @@ Keywords:} \ignorespaces}%
\newcommand*{\subfigurelabel}[1]{(\emph{#1})}
% \end{macrocode}
%\end{macro}
+%
+%\begin{macro}{\@subfloatcapbox}
+% Box to store subfloat caption.
+% \begin{macrocode}
+\newsavebox\@subfloatcapbox
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@subfloatcontsbox}
+% Box to store subfloat contents.
+% \begin{macrocode}
+\newsavebox\@subfloatcontsbox
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\subfigure}
% \begin{macrocode}
\newcommand*{\subfigure}[1][]{%
@@ -2856,18 +2961,30 @@ Keywords:} \ignorespaces}%
\def\@subfigcap{#1}%
\@subfigure
}
-
+% \end{macrocode}
+%\changes{1.09}{2010/12/01}{Added check to determine whether the
+%subfigure caption is wider than the subfigure}
+% \begin{macrocode}
\newcommand*{\@subfigure}[2][b]{%
\advance\c@figure by 1\relax
\refstepcounter{subfigure}%
- \begin{tabular}[#1]{@{}c@{}}%
- #2\\
- \subfigurelabel{\thesubfigure}%
+ \sbox\@subfloatcapbox{\subfigurelabel{\thesubfigure}%
\ifx\@subfigcap\@empty
\else
\space\@subfigcap
+ \fi}%
+ \sbox\@subfloatcontsbox{#2}%
+ \settowidth{\@tempdima}{\usebox\@subfloatcontsbox}%
+ \settowidth{\@tempdimb}{\usebox\@subfloatcapbox}%
+ \ifdim\@tempdimb>\@tempdima
+ \settowidth\@tempdimb{\subfigurelabel{\thesubfigure}\space}%
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \sbox\@subfloatcapbox{\subfigurelabel{\thesubfigure}\space
+ \parbox[t]{\@tempdima}{\@subfigcap}}%
\fi
- \end{tabular}
+ \begin{tabular}[#1]{@{}c@{}}%
+ \usebox\@subfloatcontsbox\\\usebox\@subfloatcapbox
+ \end{tabular}%
\egroup
}
% \end{macrocode}
@@ -2942,16 +3059,28 @@ Keywords:} \ignorespaces}%
\def\@subtabcap{#1}%
\@subtable
}
-
+% \end{macrocode}
+%\changes{1.09}{2010/12/01}{Added check to determine whether the
+%subtable caption is wider than the subtable}
+% \begin{macrocode}
\newcommand*{\@subtable}[2][t]{%
\refstepcounter{subtable}%
- \begin{tabular}[#1]{@{}c@{}}%
- \subtablelabel{\thesubtable}%
+ \sbox\@subfloatcapbox{\subtablelabel{\thesubtable}%
\ifx\@subtabcap\@empty
\else
\space\@subtabcap
+ \fi}%
+ \sbox\@subfloatcontsbox{#2}%
+ \settowidth{\@tempdima}{\usebox\@subfloatcontsbox}%
+ \settowidth{\@tempdimb}{\usebox\@subfloatcapbox}%
+ \ifdim\@tempdimb>\@tempdima
+ \settowidth\@tempdimb{\subtablelabel{\thesubtable}\space}%
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \sbox\@subfloatcapbox{\subtablelabel{\thesubtable}\space
+ \parbox[t]{\@tempdima}{\@subtabcap}}%
\fi
- \\#2%
+ \begin{tabular}[#1]{@{}c@{}}%
+ \usebox\@subfloatcapbox\\\usebox\@subfloatcontsbox
\end{tabular}
}
% \end{macrocode}
@@ -3176,12 +3305,31 @@ Keywords:} \ignorespaces}%
\@mainmatterfalse}
% \end{macrocode}
%\end{macro}
+%
+%\begin{macro}{\booktocpreamble}
+%\changes{1.09}{2010/12/01}{new}
+% \begin{macrocode}
+\newcommand*{\booktocpreamble}{}
+% \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
% articles.
% \begin{macrocode}
-\let\booktableofcontents\tableofcontents
+\newcommand\booktableofcontents{%
+ \if@twocolumn
+ \@restonecoltrue\onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ \chapter*{\contentsname
+ \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+ \booktocpreamble
+ \@starttoc{toc}%
+ \if@restonecol\twocolumn\fi
+}
% \end{macrocode}
%\end{macro}
%\begin{macro}{\arttableofcontents}
@@ -3232,11 +3380,24 @@ Keywords:} \ignorespaces}%
}
% \end{macrocode}
%\end{macro}
+%
+% Part labels
+% \begin{macrocode}
+\newcommand*{\@parttoclabel}{part}
+% \end{macrocode}
+%
+%\begin{macro}{\@partapp}
+%\changes{1.09}{2010/12/01}{new}
+% \begin{macrocode}
+\def\@partapp{\partname}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\partnumberformat}
% Format of the part number (in a book)
% \begin{macrocode}
\newcommand{\partnumberformat}[1]{%
- \Huge\bfseries \partname\nobreakspace#1\par\nobreak
+ \Huge\bfseries \@partapp\nobreakspace#1\par\nobreak
\vskip 20\p@
}
% \end{macrocode}
@@ -3250,18 +3411,19 @@ Keywords:} \ignorespaces}%
%\begin{macro}{\partformat}
% Overall format of part
% \begin{macrocode}
-\renewcommand*{\partformat}{\centering}
+\newcommand*{\partformat}{\centering}
% \end{macrocode}
%\end{macro}
+%
%\begin{macro}{\@bookpart}
% Numbered book part format
% \begin{macrocode}
\def\@bookpart[#1]#2{%
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
- \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}%
+ \addcontentsline{toc}{\@parttoclabel}{\protect\numberline{\thepart}#1}%
\else
- \addcontentsline{toc}{part}{#1}%
+ \addcontentsline{toc}{\@parttoclabel}{#1}%
\fi
\markboth{}{}%
{\interlinepenalty \@M
@@ -3404,7 +3566,7 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
% Declare class:
% \begin{macrocode}
-\ProvidesClass{jmlrbook}[2010/07/27 v1.07 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2010/12/01 v1.09 (NLCT) JMLR Book Style]
% \end{macrocode}
% Need \sty{xkeyval} package to have key=value class options
% \begin{macrocode}
@@ -3427,6 +3589,11 @@ Keywords:} \ignorespaces}%
\DeclareOptionX{color}{\grayscalefalse}
\DeclareOptionX{gray}{\grayscaletrue}
% \end{macrocode}
+% Pass \clsopt{letterpaper} and \clsopt{7x10} to \clsfmt{jmlr}.
+% \begin{macrocode}
+\DeclareOptionX{letterpaper}{\PassOptionsToClass{\CurrentOption}{jmlr}}
+\DeclareOptionX{7x10}{\PassOptionsToClass{\CurrentOption}{jmlr}}
+% \end{macrocode}
% Pass \clsopt{html} and \clsopt{nohtml} to \clsfmt{jmlr}.
% \begin{macrocode}
\DeclareOptionX{html}{\PassOptionsToClass{\CurrentOption}{jmlr}}
@@ -3591,12 +3758,6 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
%\end{macro}
%
-% Part labels
-% \begin{macrocode}
-\newcommand*{\@parttoclabel}{part}
-\newcommand*{\@partapp}{\partname}
-% \end{macrocode}
-%
% Extra title information
% \begin{macrocode}
\renewcommand*\jmlrtitlehook{%
@@ -3613,6 +3774,12 @@ Keywords:} \ignorespaces}%
\let\@shortauthor\@empty
}
% \end{macrocode}
+%\begin{macro}{\subtitle}
+% \begin{macrocode}
+\newcommand*{\@subtitle}{}
+\newcommand*{\subtitle}[1]{\renewcommand*{\@subtitle}{#1}}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\volume}
% \begin{macrocode}
\newcommand*{\@volume}{\@jmlrvolume}
@@ -4091,7 +4258,9 @@ Keywords:} \ignorespaces}%
% start of the document when hyperref's draft mode is on. Need
% to fix it.
% \begin{macrocode}
-\AtBeginDocument{\renewcommand\@secondoffive[5]{#2}}
+\AtBeginDocument{%
+ \renewcommand\@secondoffive[5]{#2}%
+}
% \end{macrocode}
%\end{macro}
%
@@ -4105,12 +4274,16 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
%\end{macro}
% \begin{macrocode}
-\AtBeginDocument{%
+\AtBeginDocument{\@jmlrbegindoc}
+% \end{macrocode}
+%\begin{macro}{\@jmlrbegindoc}
+\newcommand*\@jmlrbegindoc{
\@setimportlabel
\gdef\@setimportlabel{\let\ref\Xref \let\pageref\Xpageref}%
\let\ReadBookmarks\relax
}
% \end{macrocode}
+%\end{macro}
% Imported papers modify \ics{InputIfFileExists} so save original
% definition.
% \begin{macrocode}
@@ -4120,6 +4293,18 @@ Keywords:} \ignorespaces}%
%\begin{environment}{jmlrpapers}
% \begin{macrocode}
\newenvironment{jmlrpapers}{%
+% \end{macrocode}
+%\changes{1.09}{2010/12/01}{reset start and end document hook to avoid
+%problems caused by packages defining duplicate commands etc}
+% \begin{macrocode}
+\def\@begindocumenthook{%
+ \@jmlrbegindoc
+ \let\bibcite\c@lbNATbibcite
+}
+\def\@enddocumenthook{%
+ \@jmlrenddoc
+ \let\bibcite\c@lbNAT@testdef
+}
\begin{papers}[]
% \end{macrocode}
%\changes{1.07}{2010-07-30}{Added check for two column style}
@@ -4189,6 +4374,31 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\jmlrpremaketitlehook}
+%\changes{1.09}{2010/12/01}{Moved redefinition outside of import
+%macros}
+% Redefine \cs{jmlrpremaketitlehook}
+% \begin{macrocode}
+\def\jmlrpremaketitlehook{%
+ \cleardoublepage
+ \phantomsection
+ \let\@currentlabelname\@shorttitle
+% \end{macrocode}
+%\changes{1.09}{2010/12/01}{Moved \cs{refstepcounter} from
+%\cs{jmlrmaketitlehook} to \cs{jmlrpremaketitlehook}}
+% \begin{macrocode}
+ \refstepcounter{chapter}%
+}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macrocode}{\jmlrimporthook}
+% Hook just before document is imported.
+%\changes{1.09}{2010/12/01}{new}
+% \begin{macrocode}
+\newcommand*{\jmlrimporthook}{}
+% \end{macrocode}
+%\end{macrocode}
+%
%\begin{macro}{\importpubpaper}
% Import a document that has already been published.
% Syntax: \cs{importpubpaper}\oarg{label}\marg{dir}\marg{file}\marg{pages}
@@ -4209,7 +4419,10 @@ Keywords:} \ignorespaces}%
\jmlrpages{#4}%
\graphicspath{{\@importdir}}%
\def\jmlrmaketitlehook{%
- \refstepcounter{chapter}%
+% \end{macrocode}
+%\changes{1.09}{2010/12/01}{Added \cs{label} to \cs{jmlrmaketitlehook}}
+% \begin{macrocode}
+ \label{}%
\addtomaincontents{toc}%
{\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
{page.\thepage}}%
@@ -4233,11 +4446,6 @@ Keywords:} \ignorespaces}%
}%
\@write@author{#1}{\@jmlrauthors}%
}%
- \def\jmlrpremaketitlehook{%
- \cleardoublepage
- \phantomsection
- \let\@currentlabelname\@shorttitle
- }%
\def\InputIfFileExists##1##2##3{%
\IfFileExists{##1}{%
\@org@InputIfFileExists{##1}{##2}{##3}%
@@ -4247,6 +4455,7 @@ Keywords:} \ignorespaces}%
}%
}%
\def\Xprefix{#1}%
+ \jmlrimporthook
\import{\@importdir\@importfile}%
\def\Xprefix{}%
\egroup
@@ -4277,7 +4486,10 @@ not permitted outside `jmlrpapers' environment}{}%
\jmlrpages{\protect\@articlepagesref}%
\graphicspath{{\@importdir}}%
\def\jmlrmaketitlehook{%
- \refstepcounter{chapter}%
+% \end{macrocode}
+%\changes{1.09}{2010/12/01}{Added \cs{label} to \cs{jmlrmaketitlehook}}
+% \begin{macrocode}
+ \label{}%
\addtomaincontents{toc}%
{\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
{page.\thepage}}%
@@ -4297,11 +4509,6 @@ not permitted outside `jmlrpapers' environment}{}%
}%
\@write@author{#1}{\@jmlrauthors}%
}%
- \def\jmlrpremaketitlehook{%
- \cleardoublepage
- \phantomsection
- \let\@currentlabelname\@shorttitle
- }%
\def\InputIfFileExists##1##2##3{%
\IfFileExists{##1}{%
\@org@InputIfFileExists{##1}{##2}{##3}%
@@ -4311,6 +4518,7 @@ not permitted outside `jmlrpapers' environment}{}%
}%
}%
\def\Xprefix{#1}%
+ \jmlrimporthook
\import{\@importdir\@importfile}%
\def\Xprefix{}%
\egroup
@@ -4348,7 +4556,10 @@ not permitted outside `jmlrpapers' environment}{}%
\addtomaincontents{toc}%
{\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
{page.\thepage}}%
- \refstepcounter{chapter}%
+% \end{macrocode}
+%\changes{1.09}{2010/12/01}{Added \cs{label} to \cs{jmlrmaketitlehook}}
+% \begin{macrocode}
+ \label{}%
\pdfbookmark{\@shorttitle}{chapter.\thechapter}%
\def\@jmlr@authors@sep{ \& }%
\tocchapterauthor{\@jmlrauthors}%
@@ -4360,11 +4571,6 @@ not permitted outside `jmlrpapers' environment}{}%
\jmlrpublished{}%
\jmlrproceedings{}{}%
}%
- \def\jmlrpremaketitlehook{%
- \cleardoublepage
- \phantomsection
- \let\@currentlabelname\@shorttitle
- }%
\graphicspath{{\@importdir}}%
\def\InputIfFileExists##1##2##3{%
\IfFileExists{##1}{%
@@ -4375,6 +4581,7 @@ not permitted outside `jmlrpapers' environment}{}%
}%
}%
\def\Xprefix{#1}%
+ \jmlrimporthook
\import{\@importdir\@importfile}%
\def\Xprefix{}%
\egroup
@@ -4538,7 +4745,8 @@ not permitted outside `jmlrpapers' environment}{}%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
\vskip 1.0em \@plus\p@
- \setlength\@tempdima{5em}%
+ %\setlength\@tempdima{5em}%
+ \settowidth\@tempdima{\large\bfseries \@partapp\space MM}%
\vbox{%
\pagerule
\begingroup
@@ -4548,8 +4756,9 @@ not permitted outside `jmlrpapers' environment}{}%
\advance\leftskip\@tempdima
\hskip -\leftskip
\renewcommand*\numberline[1]{\hb@xt@ \@tempdima
- {\partname\space ##1\hfil }}%
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss }\par
+ {\@partapp\space ##1\hfil }}%
+ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss
+ \normalfont\normalsize #2}\par
\penalty\@highpenalty
\endgroup
\pagerule
@@ -4558,6 +4767,31 @@ not permitted outside `jmlrpapers' environment}{}%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\l@chapter}
+% \begin{macrocode}
+\renewcommand{\l@chapter}[2]{%
+ \ifnum\c@tocdepth>\m@ne
+ \addpenalty{-\@highpenalty}%
+ \vskip 1.0em \@plus \p@
+ \setlength\@tempdima{2em}%
+ \begingroup
+ \parindent \z@
+ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode \large \bfseries
+ \advance \leftskip \@tempdima
+ \hskip -\leftskip
+ \renewcommand*\numberline[1]{\hb@xt@ \@tempdima
+ {##1\hfil }}%
+ #1\nobreak \hfil \nobreak \hb@xt@ \@pnumwidth {\hss
+ \normalfont\normalsize #2}\par
+ \penalty \@highpenalty
+ \endgroup
+ \fi
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\l@papertitle}
% \begin{macrocode}
\newcommand*{\l@papertitle}[2]{%
@@ -4648,21 +4882,24 @@ not permitted outside `jmlrpapers' environment}{}%
% \end{macrocode}
%\end{macro}
%\begin{macro}{\firstpagefoot}
+%\changes{1.09}{2010/12/01}{added \cs{@reprint}}
% \begin{macrocode}
-\newcommand{\firstpagefoot}{\hfill\thepage}
+\newcommand{\firstpagefoot}{%
+ \@reprint\hfill\thepage
+}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\headfont}
% Set the header font
% \begin{macrocode}
-\renewcommand*{\headfont}{\reset@font\small\scshape}%
+\newcommand*{\headfont}{\reset@font\small\scshape}%
% \end{macrocode}
%\end{macro}
%\begin{macro}{\footfont}
% Set the footer font
% \begin{macrocode}
-\renewcommand*{\footfont}{\reset@font\small\itshape}%
+\newcommand*{\footfont}{\reset@font\small\itshape}%
% \end{macrocode}
%\end{macro}
%
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
index 93b3ef85323..4cab2626ba8 100644
--- a/Master/texmf-dist/source/latex/jmlr/jmlr.ins
+++ b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
@@ -1,4 +1,4 @@
-% jmlr.ins generated using makedtx version 0.94b 2010/7/27 11:45
+% jmlr.ins generated using makedtx version 0.94b 2010/12/1 14:29
\input docstrip
\preamble
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
index 8ae797d599b..3f8f8151f2a 100644
--- a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
+++ b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
@@ -41,7 +41,7 @@
%% First editor:
%% Second editor:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2010/07/27 v1.08 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2010/12/01 v1.09 (NLCT) Journal of Machine Learning Research]
\newif\if@openright
\newif\if@mainmatter \@mainmattertrue
\@ifundefined{ifgrayscale}{
@@ -85,10 +85,10 @@
\viiXxfalse
\DeclareOption{7x10}{\viiXxtrue}
\DeclareOption{letterpaper}{\PassOptionsToPackage{letterpaper}{typearea}}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ExecuteOptions{twoside,letterpaper}
\ProcessOptions
-\LoadClass[pointednumbers,normalheadings]{scrartcl}
+\LoadClass{article}
\ifviiXx
\setlength{\paperwidth}{7in}
\setlength{\paperheight}{10in}
@@ -126,13 +126,34 @@
\def\ds@draft{\overfullrule 5pt}
\bibliographystyle{plainnat}
\bibpunct{(}{)}{;}{a}{,}{,}
-\addtokomafont{section}{\rmfamily\large}
-\addtokomafont{subsection}{\rmfamily\normalsize}
-\addtokomafont{subsubsection}{\rmfamily\mdseries\normalsize\scshape}
-\addtokomafont{paragraph}{\rmfamily\normalsize}
-\addtokomafont{subparagraph}{\rmfamily\itshape\normalsize}
-\renewcommand*{\othersectionlevelsformat}[1]{%
- \csname pre#1num\endcsname\csname the#1\endcsname\autodot\enskip}
+\renewcommand{\section}{\@startsection{section}{1}{\z@}%
+ {-0.24in \@plus -1ex \@minus -.2ex}%
+ {0.10in \@plus.2ex}%
+ {\normalfont\rmfamily\bfseries\large\raggedright}%
+}
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+ {-0.20in \@plus -1ex \@minus -.2ex}%
+ {0.08in \@plus .2ex}%
+ {\normalfont\rmfamily\bfseries\normalsize\raggedright}%
+}
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-0.18in \@plus -1ex \@minus -.2ex}%
+ {0.08in \@plus .2ex}%
+ {\normalfont\normalsize\rmfamily\mdseries\scshape\raggedright}%
+}
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {1.5ex plus 0.5ex minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\rmfamily\bfseries}%
+}
+\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\z@}%
+ {1.5ex plus 0.5ex minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\rmfamily\bfseries\itshape}}
+\renewcommand*\@seccntformat[1]{%
+ \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}
@@ -140,7 +161,7 @@
\renewenvironment{abstract}{\HCode{<h3>}Abstract\HCode{</h3>}}{}%
\else
\renewenvironment{abstract}
- {\centerline{\large\bfseries Abstract}\vspace{0.7ex}%
+ {{\centering\large\bfseries Abstract\par}\vspace{0.7ex}%
\bgroup
\leftskip 20pt\rightskip 20pt\small\noindent\ignorespaces}%
{\par\egroup\vskip 0.25ex}
@@ -244,8 +265,10 @@ Keywords:} \ignorespaces}%
\def\@endeditor{\normalsize}
\def\jmlrpretitle{\vskip\beforetitskip\begin{center}\Large\bfseries}
\def\jmlrposttitle{\par\end{center}\vskip\aftertitskip}
+\newcommand*{\nametag}[1]{}
\def\jmlrpreauthor{%
\bgroup
+ \def\nametag##1{##1}%
\def\and{\unskip\enspace{\normalfont and}\enspace}%
\def\addr{\small\itshape}%
\def\name{\ClassError{jmlr}{Use \string\Name{Author's Name} not \string\name}{}}%
@@ -256,13 +279,13 @@ Keywords:} \ignorespaces}%
}
\def\@email{\hfill\small\mdseries\scshape}%
\def\@name{\normalsize\upshape\bfseries}%
-\def\@parsename#1 #2\@nil{%
+\def\@parsename#1 #2\end@parsename{%
\def\@tmp{#2}%
- \ifx\@tmp\@empty
+ \ifx\@tmp\@nnil
\def\@surname{#1}%
\let\@nextparsename\@parsenamenoop
\else
- \@getinitial#1-\relax\relax\end
+ \@getinitial#1-\relax\relax\end@getinitial
\ifx\@forenames\@empty
\def\@forenames{#1}%
\protected@edef\@initials{\@initial}%
@@ -274,10 +297,10 @@ Keywords:} \ignorespaces}%
\fi
\let\@nextparsename\@parsename
\fi
- \@nextparsename#2\@nil
+ \@nextparsename#2\end@parsename
}
-\def\@parsenamenoop#1\@nil{}
-\def\@getinitial#1#2-#3#4\end{%
+\def\@parsenamenoop#1\end@parsename{}
+\def\@getinitial#1#2-#3#4\end@getinitial{%
\def\@jmlr@tmp{#3}%
\if\@jmlr@tmp\relax
\def\@initial{#1.}%
@@ -288,7 +311,8 @@ Keywords:} \ignorespaces}%
\newcommand*{\Name}[1]{%
\def\@forenames{}%
\def\@surname{}%
- \@parsename#1 \@nil
+ \def\nametag##1{}%
+ \@parsename#1 \@nil\end@parsename
\ifx\@shortauthor\@empty
\ifx\@sauthor\@empty
\global\let\@shortauthor\@surname
@@ -305,6 +329,7 @@ Keywords:} \ignorespaces}%
\noexpand\@jmlr@authors@sep
\@initials\space\@surname}%
\fi
+ \def\nametag##1{##1}%
\@name #1%
}
\newcommand*{\Email}[1]{{\@email #1}}
@@ -338,13 +363,20 @@ Keywords:} \ignorespaces}%
\gdef\@editor{#1}%
}
\def\firstpageno#1{\setcounter{page}{#1}}
-\AtEndDocument{%
+\AtEndDocument{\@jmlrenddoc}
+\newcommand*{\@jmlrenddoc}{%
\@ifundefined{phantomsection}{}{\phantomsection}%
\protected@edef\@currentlabelname{end of \@shorttitle}%
\label{jmlrend}%
+ \global\let\@reprint\@empty
}
\newcommand*{\@titlefoot}{\scriptsize\copyright\space\@jmlryear
- \space\@jmlrauthors.\hfill}
+ \space\@jmlrauthors.\hfill
+ \@reprint
+}
+\let\@reprint\@empty
+\newcommand{\reprint}[1]{%
+ \gdef\@reprint{Reprinted with permission for JMLR#1}}
\newcommand\ps@jmlrtps{%
\let\@mkboth\@gobbletwo
\def\@oddhead{\scriptsize \@jmlrproceedings
@@ -449,7 +481,7 @@ Keywords:} \ignorespaces}%
\newcommand*{\appendixsrefname}{Appendices}
\newcommand*{\partrefname}{Part}
\newcommand*{\partsrefname}{Parts}
-\newcommand*{\objectref}[5]{%
+\DeclareRobustCommand*{\objectref}[5]{%
\let\@objectname\@empty
\def\@objectref{}%
\let\@prevsep\@empty
@@ -518,6 +550,11 @@ Keywords:} \ignorespaces}%
\vskip\baselineskip
#2\label{#1}%
}
+\newcommand{\algocfconts}[3]{%
+ \@algocf@pre@ruled
+ #2\label{#1}\kern2pt\hrule height.8pt depth0pt\kern2pt%
+ #3\@algocf@pre@ruled
+}
\newcommand*{\includeteximage}[2][]{%
\def\Gin@req@sizes{%
\Gin@req@height\Gin@nat@height
@@ -575,16 +612,14 @@ Keywords:} \ignorespaces}%
\fi
\newenvironment{algorithm}[1][htbp]%
{%
- \@algocf@init%
- \@algocf@init@caption
\begin{algocf}[#1]%
- \@algocf@start%
+ \renewcommand\@makecaption[2]{%
+ \hskip\AlCapHSkip
+ \parbox[t]{\hsize}{\algocf@captiontext{##1}{##2}}%
+ }%
}%
{%
- \@algocf@finish%
- \@algocf@term@caption
\end{algocf}%
- \@algocf@term
}
\setlength\algomargin{0pt}
\newcommand{\artappendix}{\par
@@ -642,6 +677,7 @@ 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}%
@@ -674,23 +710,33 @@ Keywords:} \ignorespaces}%
\@objectref
}
\newcommand*{\subfigurelabel}[1]{(\emph{#1})}
+\newsavebox\@subfloatcapbox
+\newsavebox\@subfloatcontsbox
\newcommand*{\subfigure}[1][]{%
\bgroup
\def\@subfigcap{#1}%
\@subfigure
}
-
\newcommand*{\@subfigure}[2][b]{%
\advance\c@figure by 1\relax
\refstepcounter{subfigure}%
- \begin{tabular}[#1]{@{}c@{}}%
- #2\\
- \subfigurelabel{\thesubfigure}%
+ \sbox\@subfloatcapbox{\subfigurelabel{\thesubfigure}%
\ifx\@subfigcap\@empty
\else
\space\@subfigcap
+ \fi}%
+ \sbox\@subfloatcontsbox{#2}%
+ \settowidth{\@tempdima}{\usebox\@subfloatcontsbox}%
+ \settowidth{\@tempdimb}{\usebox\@subfloatcapbox}%
+ \ifdim\@tempdimb>\@tempdima
+ \settowidth\@tempdimb{\subfigurelabel{\thesubfigure}\space}%
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \sbox\@subfloatcapbox{\subfigurelabel{\thesubfigure}\space
+ \parbox[t]{\@tempdima}{\@subfigcap}}%
\fi
- \end{tabular}
+ \begin{tabular}[#1]{@{}c@{}}%
+ \usebox\@subfloatcontsbox\\\usebox\@subfloatcapbox
+ \end{tabular}%
\egroup
}
\newcounter{subtable}
@@ -732,16 +778,24 @@ Keywords:} \ignorespaces}%
\def\@subtabcap{#1}%
\@subtable
}
-
\newcommand*{\@subtable}[2][t]{%
\refstepcounter{subtable}%
- \begin{tabular}[#1]{@{}c@{}}%
- \subtablelabel{\thesubtable}%
+ \sbox\@subfloatcapbox{\subtablelabel{\thesubtable}%
\ifx\@subtabcap\@empty
\else
\space\@subtabcap
+ \fi}%
+ \sbox\@subfloatcontsbox{#2}%
+ \settowidth{\@tempdima}{\usebox\@subfloatcontsbox}%
+ \settowidth{\@tempdimb}{\usebox\@subfloatcapbox}%
+ \ifdim\@tempdimb>\@tempdima
+ \settowidth\@tempdimb{\subtablelabel{\thesubtable}\space}%
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \sbox\@subfloatcapbox{\subtablelabel{\thesubtable}\space
+ \parbox[t]{\@tempdima}{\@subtabcap}}%
\fi
- \\#2%
+ \begin{tabular}[#1]{@{}c@{}}%
+ \usebox\@subfloatcapbox\\\usebox\@subfloatcontsbox
\end{tabular}
}
\newcounter{chapter}
@@ -856,7 +910,19 @@ Keywords:} \ignorespaces}%
\clearpage
\fi
\@mainmatterfalse}
-\let\booktableofcontents\tableofcontents
+\newcommand*{\booktocpreamble}{}
+\newcommand\booktableofcontents{%
+ \if@twocolumn
+ \@restonecoltrue\onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ \chapter*{\contentsname
+ \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+ \booktocpreamble
+ \@starttoc{toc}%
+ \if@restonecol\twocolumn\fi
+}
\let\arttableofcontents\tableofcontents
\newcommand{\artpart}{%
\if@noskipsec \leavevmode\fi
@@ -885,18 +951,20 @@ Keywords:} \ignorespaces}%
\newcommand{\parttitleformat}[1]{%
\Huge\bfseries#1%
}
+\newcommand*{\@parttoclabel}{part}
+\def\@partapp{\partname}
\newcommand{\partnumberformat}[1]{%
- \Huge\bfseries \partname\nobreakspace#1\par\nobreak
+ \Huge\bfseries \@partapp\nobreakspace#1\par\nobreak
\vskip 20\p@
}
\newcommand{\preparthook}{\null\vfil}
-\renewcommand*{\partformat}{\centering}
+\newcommand*{\partformat}{\centering}
\def\@bookpart[#1]#2{%
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
- \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}%
+ \addcontentsline{toc}{\@parttoclabel}{\protect\numberline{\thepart}#1}%
\else
- \addcontentsline{toc}{part}{#1}%
+ \addcontentsline{toc}{\@parttoclabel}{#1}%
\fi
\markboth{}{}%
{\interlinepenalty \@M
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
index 9ccf32d3d35..4dc4c64e7d3 100644
--- a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
+++ b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
@@ -41,7 +41,7 @@
%% First editor:
%% Second editor:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlrbook}[2010/07/27 v1.07 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2010/12/01 v1.09 (NLCT) JMLR Book Style]
\RequirePackage{xkeyval}
\newcommand*{\@prehyperref}{}
\define@key{jmlrbook.cls}{prehyperref}{%
@@ -50,6 +50,8 @@
\grayscalefalse
\DeclareOptionX{color}{\grayscalefalse}
\DeclareOptionX{gray}{\grayscaletrue}
+\DeclareOptionX{letterpaper}{\PassOptionsToClass{\CurrentOption}{jmlr}}
+\DeclareOptionX{7x10}{\PassOptionsToClass{\CurrentOption}{jmlr}}
\DeclareOptionX{html}{\PassOptionsToClass{\CurrentOption}{jmlr}}
\DeclareOptionX{nohtml}{\PassOptionsToClass{\CurrentOption}{jmlr}}
\DeclareOptionX{wcp}{\PassOptionsToClass{\CurrentOption}{jmlr}}
@@ -125,8 +127,6 @@
\@nameuse{@jmlr@author@#1}%
}%
}
-\newcommand*{\@parttoclabel}{part}
-\newcommand*{\@partapp}{\partname}
\renewcommand*\jmlrtitlehook{%
\hypersetup{pdftitle={\@shorttitle}}%
\let\jmlrtitlehook\relax
@@ -140,6 +140,8 @@
\let\jmlrauthorhook\relax
\let\@shortauthor\@empty
}
+\newcommand*{\@subtitle}{}
+\newcommand*{\subtitle}[1]{\renewcommand*{\@subtitle}{#1}}
\newcommand*{\@volume}{\@jmlrvolume}
\newcommand*{\volume}[1]{\renewcommand*{\@volume}{#1}}
\newcommand*{\@issue}{\@jmlrissue}
@@ -371,18 +373,29 @@
\expandafter\Hy@setref@link#1\@empty\@empty\@nil{#2}%
\fi
}
-\AtBeginDocument{\renewcommand\@secondoffive[5]{#2}}
+\AtBeginDocument{%
+ \renewcommand\@secondoffive[5]{#2}%
+}
\def\@setimportlabel{%
\let\@mainauxout\@auxout
\let\HRlabel\label
}
-\AtBeginDocument{%
+\AtBeginDocument{\@jmlrbegindoc}
+\newcommand*\@jmlrbegindoc{
\@setimportlabel
\gdef\@setimportlabel{\let\ref\Xref \let\pageref\Xpageref}%
\let\ReadBookmarks\relax
}
\let\@org@InputIfFileExists\InputIfFileExists
\newenvironment{jmlrpapers}{%
+\def\@begindocumenthook{%
+ \@jmlrbegindoc
+ \let\bibcite\c@lbNATbibcite
+}
+\def\@enddocumenthook{%
+ \@jmlrenddoc
+ \let\bibcite\c@lbNAT@testdef
+}
\begin{papers}[]
\if@twocolumn
\def\@jmlr@restore{\twocolumn}%
@@ -418,6 +431,13 @@
\protected@write\@mainauxout{}{\string\@jmlr@import{#1}{#2}{#3}}%
}
\newcommand*{\@jmlr@import}[3]{}
+\def\jmlrpremaketitlehook{%
+ \cleardoublepage
+ \phantomsection
+ \let\@currentlabelname\@shorttitle
+ \refstepcounter{chapter}%
+}%
+\newcommand*{\jmlrimporthook}{}
\newcommand*{\@importpubpaper}[4][\@importdir\@importfile]{%
\bgroup
\def\@importdir{#2/}%
@@ -428,7 +448,7 @@
\jmlrpages{#4}%
\graphicspath{{\@importdir}}%
\def\jmlrmaketitlehook{%
- \refstepcounter{chapter}%
+ \label{}%
\addtomaincontents{toc}%
{\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
{page.\thepage}}%
@@ -452,11 +472,6 @@
}%
\@write@author{#1}{\@jmlrauthors}%
}%
- \def\jmlrpremaketitlehook{%
- \cleardoublepage
- \phantomsection
- \let\@currentlabelname\@shorttitle
- }%
\def\InputIfFileExists##1##2##3{%
\IfFileExists{##1}{%
\@org@InputIfFileExists{##1}{##2}{##3}%
@@ -466,6 +481,7 @@
}%
}%
\def\Xprefix{#1}%
+ \jmlrimporthook
\import{\@importdir\@importfile}%
\def\Xprefix{}%
\egroup
@@ -489,7 +505,7 @@ not permitted outside `jmlrpapers' environment}{}%
\jmlrpages{\protect\@articlepagesref}%
\graphicspath{{\@importdir}}%
\def\jmlrmaketitlehook{%
- \refstepcounter{chapter}%
+ \label{}%
\addtomaincontents{toc}%
{\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
{page.\thepage}}%
@@ -509,11 +525,6 @@ not permitted outside `jmlrpapers' environment}{}%
}%
\@write@author{#1}{\@jmlrauthors}%
}%
- \def\jmlrpremaketitlehook{%
- \cleardoublepage
- \phantomsection
- \let\@currentlabelname\@shorttitle
- }%
\def\InputIfFileExists##1##2##3{%
\IfFileExists{##1}{%
\@org@InputIfFileExists{##1}{##2}{##3}%
@@ -523,6 +534,7 @@ not permitted outside `jmlrpapers' environment}{}%
}%
}%
\def\Xprefix{#1}%
+ \jmlrimporthook
\import{\@importdir\@importfile}%
\def\Xprefix{}%
\egroup
@@ -548,7 +560,7 @@ not permitted outside `jmlrpapers' environment}{}%
\addtomaincontents{toc}%
{\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
{page.\thepage}}%
- \refstepcounter{chapter}%
+ \label{}%
\pdfbookmark{\@shorttitle}{chapter.\thechapter}%
\def\@jmlr@authors@sep{ \& }%
\tocchapterauthor{\@jmlrauthors}%
@@ -560,11 +572,6 @@ not permitted outside `jmlrpapers' environment}{}%
\jmlrpublished{}%
\jmlrproceedings{}{}%
}%
- \def\jmlrpremaketitlehook{%
- \cleardoublepage
- \phantomsection
- \let\@currentlabelname\@shorttitle
- }%
\graphicspath{{\@importdir}}%
\def\InputIfFileExists##1##2##3{%
\IfFileExists{##1}{%
@@ -575,6 +582,7 @@ not permitted outside `jmlrpapers' environment}{}%
}%
}%
\def\Xprefix{#1}%
+ \jmlrimporthook
\import{\@importdir\@importfile}%
\def\Xprefix{}%
\egroup
@@ -650,7 +658,8 @@ not permitted outside `jmlrpapers' environment}{}%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
\vskip 1.0em \@plus\p@
- \setlength\@tempdima{5em}%
+ %\setlength\@tempdima{5em}%
+ \settowidth\@tempdima{\large\bfseries \@partapp\space MM}%
\vbox{%
\pagerule
\begingroup
@@ -660,13 +669,34 @@ not permitted outside `jmlrpapers' environment}{}%
\advance\leftskip\@tempdima
\hskip -\leftskip
\renewcommand*\numberline[1]{\hb@xt@ \@tempdima
- {\partname\space ##1\hfil }}%
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss }\par
+ {\@partapp\space ##1\hfil }}%
+ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss
+ \normalfont\normalsize #2}\par
\penalty\@highpenalty
\endgroup
\pagerule
}%
\fi}
+\renewcommand{\l@chapter}[2]{%
+ \ifnum\c@tocdepth>\m@ne
+ \addpenalty{-\@highpenalty}%
+ \vskip 1.0em \@plus \p@
+ \setlength\@tempdima{2em}%
+ \begingroup
+ \parindent \z@
+ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode \large \bfseries
+ \advance \leftskip \@tempdima
+ \hskip -\leftskip
+ \renewcommand*\numberline[1]{\hb@xt@ \@tempdima
+ {##1\hfil }}%
+ #1\nobreak \hfil \nobreak \hb@xt@ \@pnumwidth {\hss
+ \normalfont\normalsize #2}\par
+ \penalty \@highpenalty
+ \endgroup
+ \fi
+}
\newcommand*{\l@papertitle}[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
@@ -726,9 +756,11 @@ not permitted outside `jmlrpapers' environment}{}%
\@mkboth{\@curparthead}{\protect\thechapter. #1}%
}
\newcommand{\firstpagehead}{}
-\newcommand{\firstpagefoot}{\hfill\thepage}
-\renewcommand*{\headfont}{\reset@font\small\scshape}%
-\renewcommand*{\footfont}{\reset@font\small\itshape}%
+\newcommand{\firstpagefoot}{%
+ \@reprint\hfill\thepage
+}
+\newcommand*{\headfont}{\reset@font\small\scshape}%
+\newcommand*{\footfont}{\reset@font\small\itshape}%
\newcommand*{\ps@chplain}{%
\let\@mkboth\@gobbletwo
\renewcommand*{\@oddhead}{\headfont\firstpagehead}%