summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/jmlr
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-01-06 00:56:16 +0000
committerKarl Berry <karl@freefriends.org>2012-01-06 00:56:16 +0000
commit064060e7ba808e496c0d66919f339be2ef91e323 (patch)
tree29002a6a11864bccd1ca40836bcaa6dc5d5b77f1 /Master/texmf-dist/tex/latex/jmlr
parent2fa3ace8e2fef6e8c7c4336917808b63a1ccca21 (diff)
jmlr 1.12 (5jan12)
git-svn-id: svn://tug.org/texlive/trunk@25029 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/jmlr')
-rw-r--r--Master/texmf-dist/tex/latex/jmlr/jmlr.cls92
-rw-r--r--Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls77
2 files changed, 116 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
index cf016afd3db..3e92bde0266 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 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
@@ -41,11 +41,9 @@
%% First editor:
%% Second editor:
\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]
\RequirePackage{xkeyval}
-\providecommand*{\jmlr@prehyperref}{}
-\define@key{jmlr.cls}{prehyperref}{%
- \renewcommand*{\jmlr@prehyperref}{#1}}
+\providecommand*{\jmlrprehyperref}{}
\newif\if@openright
\newif\if@mainmatter \@mainmattertrue
\@ifundefined{ifgrayscale}{
@@ -127,14 +125,15 @@
\RequirePackage{url}
\RequirePackage[x11names]{xcolor}
\RequirePackage[algo2e,ruled]{algorithm2e}
-\jmlr@prehyperref
-\usepackage[colorlinks,
+\jmlrprehyperref
+\usepackage{hyperref}
+\usepackage{nameref}
+\hypersetup{colorlinks,
linkcolor=blue,
citecolor=blue,
urlcolor=magenta,
linktocpage,
- plainpages=false]{hyperref}
-\usepackage{nameref}
+ plainpages=false}
\ifgrayscale
\hypersetup{draft}
\fi
@@ -213,11 +212,13 @@ Keywords:} \ignorespaces}%
\setlength\beforetitskip{0.05in plus 0.08in minus 0.08in}
\setlength\interauthorskip{0.08in plus 0.1in minus 0.1in}
\setlength\aftermaketitskip{0.3in plus 0.1in minus 0.1in}
+\newcommand*{\titlebreak}{\newline}
\renewcommand*{\title}[2][\@title]{%
\def\@shorttitle{#1}%
\def\@title{#2}%
\jmlrtitlehook
}
+\newcommand*{\@shorttitle}{\jobname}
\newcommand*{\jmlrtitlehook}{}
\renewcommand*{\author}[2][]{%
\def\@author{#2}%
@@ -269,11 +270,11 @@ Keywords:} \ignorespaces}%
\newcommand*{\jmlrmaketitlehook}{}
\newcommand*{\jmlrpremaketitlehook}{}
\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
}
%%\begin{macro}{\jmlrbox}
\newsavebox\jmlrbox
@@ -331,29 +332,49 @@ Keywords:} \ignorespaces}%
\def\@initial{#1.-#3.}%
\fi
}
-\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%
}
\newcommand*{\jmlrabbrnamelist}[1]{%
\def\nametag##1{}%
@@ -421,7 +442,7 @@ Keywords:} \ignorespaces}%
\global\let\@reprint\@empty
}
\newcommand*{\@titlefoot}{\scriptsize\copyright\space\@jmlryear
- \space\@jmlrauthors.\hfill
+ \space\@jmlr@authors.\hfill
\@reprint
}
\let\@reprint\@empty
@@ -430,9 +451,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
@@ -475,7 +513,8 @@ Keywords:} \ignorespaces}%
\let\@jmlrworkshop\@empty
\newcommand*{\jmlrworkshop}[1]{\renewcommand*{\@jmlrworkshop}{#1}}
\newcommand*{\@jmlrauthors}{}
-\newcommand*{\jmlrauthors}[1]{\renewcommand*{\@jmlrauthors}{#1}}
+\newcommand*{\@jmlr@authors}{\@jmlrauthors}
+\newcommand*{\jmlrauthors}[1]{\global\def\@jmlr@authors{#1}}
\def\figurecaption#1#2{\noindent\hangindent 40pt
\hbox to 36pt {\small\slshape #1 \hfil}
@@ -676,7 +715,7 @@ Keywords:} \ignorespaces}%
\setcounter{section}{0}
\setcounter{subsection}{0}
\def\thesection{\Alph{section}}
- \def\theHsection{\Alph{section}}
+ \def\theHsection{\theHchapter.\Alph{section}}
\def\presectionnum{Appendix~}%
}
\let\appendix\artappendix
@@ -964,6 +1003,7 @@ Keywords:} \ignorespaces}%
\fi
\@mainmatterfalse}
\newcommand*{\booktocpreamble}{}
+\newcommand*{\booktocpostamble}{}
\newcommand\booktableofcontents{%
\if@twocolumn
\@restonecoltrue\onecolumn
@@ -974,6 +1014,7 @@ Keywords:} \ignorespaces}%
\@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
\booktocpreamble
\@starttoc{toc}%
+ \booktocpostamble
\if@restonecol\twocolumn\fi
}
\let\arttableofcontents\tableofcontents
@@ -1098,6 +1139,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
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
index f05c4fc0dd9..74d58356431 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 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
@@ -41,11 +41,11 @@
%% First editor:
%% Second editor:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlrbook}[2011/03/24 v1.11 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2012/01/05 v1.12 (NLCT) JMLR Book Style]
\RequirePackage{xkeyval}
-\newcommand*{\jmlr@prehyperref}{}
-\define@key{jmlrbook.cls}{prehyperref}{%
- \renewcommand*{\jmlr@prehyperref}{#1}}
+\RequirePackage{setspace}
+\RequirePackage{fink}
+\providecommand*{\jmlrprehyperref}{}
\newif\ifgrayscale
\grayscalefalse
\DeclareOptionX{color}{\grayscalefalse}
@@ -89,8 +89,6 @@
\expandafter\NAT@split\NAT@temp?????@@%
\expandafter\NAT@parse@date\NAT@date??????@@%
\ifciteindex\NAT@index\fi}
-\RequirePackage{setspace}
-\RequirePackage{fink}
\@twosidetrue
\newif\if@openright
\@openrighttrue
@@ -338,15 +336,18 @@
\@ifundefined{c@example}{}{\setcounter{example}{0}}%
}
\renewcommand*{\contentsname}{Table of Contents}
-\def\theHalgorithm{\thechapter.\thealgorithm}
-\def\theHexample{\thechapter.\theexample}
-\def\theHtheorem{\thechapter.\thetheorem}
-\def\theHsection{\thechapter.\thesection}
-\def\theHsubsection{\thechapter.\thesubsection}
-\def\theHsubsubsection{\thechapter.\thesubsubsection}
-\def\theHparagraph{\thechapter.\theparagraph}
-\def\theHsubfigure{\thechapter.\thefigure.\thesubfigure}
-\def\theHsubtable{\thechapter.\thetable.\thesubtable}
+\def\theHalgorithm{\theHchapter.\thealgorithm}
+\def\theHexample{\theHchapter.\theexample}
+\def\theHtheorem{\theHchapter.\thetheorem}
+\def\theHsection{\theHchapter.\thesection}
+\def\theHsubsection{\theHchapter.\thesubsection}
+\def\theHsubsubsection{\theHchapter.\thesubsubsection}
+\def\theHparagraph{\theHchapter.\theparagraph}
+\def\theHsubfigure{\theHfigure.\arabic{subfigure}}
+\def\theHsubtable{\theHtable.\arabic{subtable}}
+\def\theHfootnote{\theHchapter.\alpha{footnote}}
+\def\theHtable{\theHchapter.\arabic{table}}
+\def\theHfigure{\theHchapter.\arabic{figure}}
\renewcommand*{\mailto}[1]{%
\href{mailto:#1}{\nolinkurl{#1}}%
}
@@ -490,18 +491,24 @@
\graphicspath{{\@importdir}}%
\def\jmlrmaketitlehook{%
\label{}%
+ \def\titlebreak{ }%
\addtomaincontents{toc}%
- {\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
+ {%
+ \protect\contentsline{papertitle}{\@title}{\thepage}%
{page.\thepage}}%
- \pdfbookmark{\@shorttitle}{chapter.\thechapter}%
+ \pdfbookmark{\@shorttitle}{chapter.\theHchapter}%
\def\@jmlr@authors@sep{ \& }%
- \tocchapterpubauthor{\@jmlrauthors}%
+ \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
@@ -511,7 +518,7 @@
\fi
\space\@jmlryear
}%
- \@write@author{#1}{\@jmlrauthors}%
+ \@write@author{#1}{\@jmlr@authors}%
}%
\def\InputIfFileExists##1##2##3{%
\IfFileExists{##1}{%
@@ -529,6 +536,7 @@
\gdef\@shortauthor{}%
\gdef\@shorttitle{}%
\gdef\@firstauthor{}%
+ \gdef\@jmlr@authors{\@jmlrauthors}%
\gdef\@jmlrauthors{}%
\gdef\@firstsurname{}%
}
@@ -547,24 +555,31 @@ not permitted outside `jmlrpapers' environment}{}%
\graphicspath{{\@importdir}}%
\def\jmlrmaketitlehook{%
\label{}%
+ \def\titlebreak{ }%
\addtomaincontents{toc}%
- {\protect\contentsline{papertitle}{\@shorttitle}{\thepage}%
+ {%
+ \protect\contentsline{papertitle}{\@title}{\thepage}%
{page.\thepage}}%
- \pdfbookmark{\@shorttitle}{chapter.\thechapter}%
+ \pdfbookmark{\@shorttitle}{chapter.\theHchapter}%
\def\@jmlr@authors@sep{ \& }%
- \tocchapterpubauthor{\@jmlrauthors}%
+ \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}%
+ \@write@author{#1}{\@jmlr@authors}%
}%
\def\InputIfFileExists##1##2##3{%
\IfFileExists{##1}{%
@@ -582,6 +597,7 @@ not permitted outside `jmlrpapers' environment}{}%
\gdef\@shortauthor{}%
\gdef\@shorttitle{}%
\gdef\@firstauthor{}%
+ \gdef\@jmlr@authors{\@jmlrauthors}%
\gdef\@jmlrauthors{}%
\gdef\@firstsurname{}%
}
@@ -598,14 +614,16 @@ 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}%
+ {%
+ \protect\contentsline{papertitle}{\@title}{\thepage}%
{page.\thepage}}%
\label{}%
- \pdfbookmark{\@shorttitle}{chapter.\thechapter}%
+ \pdfbookmark{\@shorttitle}{chapter.\theHchapter}%
\def\@jmlr@authors@sep{ \& }%
- \tocchapterauthor{\@jmlrauthors}%
- \@write@author{#1}{\@jmlrauthors}%
+ \tocchapterauthor{\@jmlr@authors}%
+ \@write@author{#1}{\@jmlr@authors}%
\jmlrpages{}%
\jmlrvolume{}%
\jmlryear{}%
@@ -630,6 +648,7 @@ not permitted outside `jmlrpapers' environment}{}%
\gdef\@shortauthor{}%
\gdef\@shorttitle{}%
\gdef\@firstauthor{}%
+ \gdef\@jmlr@authors{\@jmlrauthors}%
\gdef\@jmlrauthors{}%
\gdef\@firstsurname{}%
}