From 4e3b1a66cb5bc31b99a07f4194dbab513ae0181b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Oct 2013 23:22:22 +0000 Subject: jmlr (18oct13) git-svn-id: svn://tug.org/texlive/trunk@31945 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/jmlr/jmlr.cls | 119 +++++++++++++++++++++++++- Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls | 15 ++-- 2 files changed, 125 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/latex/jmlr') diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls index 23e01c425f0..96690affece 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 2012 Nicola Talbot +%% Copyright 2013 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -41,8 +41,10 @@ %% First editor: %% Second editor: \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlr}[2012/05/30 v1.17 (NLCT) Journal of Machine Learning Research] +\ProvidesClass{jmlr}[2013/10/17 v1.18 (NLCT) Journal of Machine Learning Research] \RequirePackage{xkeyval} +\RequirePackage{calc} +\RequirePackage{etoolbox} \providecommand*{\jmlrprehyperref}{} \newif\if@openright \newif\if@mainmatter \@mainmattertrue @@ -54,6 +56,8 @@ \PassOptionsToPackage{color}{xcolor}} \DeclareOptionX{gray}{\grayscaletrue \PassOptionsToPackage{gray}{xcolor}} +\DeclareOptionX{draft}{\setlength\overfullrule{5pt}} +\DeclareOptionX{final}{\setlength\overfullrule{0pt}} \newif\iftablecaptiontop \tablecaptiontoptrue \DeclareOptionX{tablecaptiontop}{\tablecaptiontoptrue} @@ -145,7 +149,6 @@ \clubpenalty=10000\relax \@twosidetrue \@mparswitchtrue -\def\ds@draft{\overfullrule 5pt} \bibliographystyle{plainnat} \bibpunct{(}{)}{;}{a}{,}{,} \renewcommand{\section}{\@startsection{section}{1}{\z@}% @@ -727,9 +730,111 @@ Keywords:} \ignorespaces}% \def\presectionnum{Appendix~}% } \let\appendix\artappendix +\newcommand{\booklinebreak}[1][]{} \newcommand{\BlackBox}{\rule{1.5ex}{1.5ex}} \newenvironment{proof}{\par\noindent{\bfseries\upshape Proof\ }}{\hfill\BlackBox\\[2mm]} +\newcommand*{\theorembodyfont}[1]{% + \renewcommand*{\@theorembodyfont}{#1}% +} +\newcommand*{\@theorembodyfont}{\normalfont\itshape}% +\newcommand*{\theoremheaderfont}[1]{% + \renewcommand*{\@theoremheaderfont}{#1}% +} +\newcommand*{\@theoremheaderfont}{\normalfont\bfseries }% +\newcommand*{\theoremsep}[1]{% + \renewcommand*{\@theoremsep}{#1}% +} +\newcommand*{\@theoremsep}{}% +\newcommand*{\theorempostheader}[1]{% + \renewcommand*{\@theorempostheader}{#1}% +} +\newcommand*{\@theorempostheader}{}% +\let\jmlr@org@newtheorem\newtheorem +\renewcommand*{\newtheorem}{\@ifstar\jmlr@snewtheorem\jmlr@newtheorem} +\newcommand*{\jmlr@snewtheorem}[2]{% + \cslet{jmlr@thm@#1@body@font}{\@theorembodyfont}% + \cslet{jmlr@thm@#1@header@font}{\@theoremheaderfont}% + \cslet{jmlr@thm@#1@sep}{\@theoremsep}% + \cslet{jmlr@thm@#1@postheader}{\@theorempostheader}% + \newenvironment{#1}% + {% + \trivlist + \item + [% + \hskip\labelsep{\csuse{jmlr@thm@#1@header@font}#2% + \csuse{jmlr@thm@#1@postheader}% + }% + ]% + \mbox{}\csuse{jmlr@thm@#1@sep}% + \csuse{jmlr@thm@#1@body@font}% + }% + {% + \endtrivlist + }% +} +\newcommand{\jmlr@newtheorem}[1]{% + \cslet{jmlr@thm@#1@body@font}{\@theorembodyfont}% + \cslet{jmlr@thm@#1@header@font}{\@theoremheaderfont}% + \cslet{jmlr@thm@#1@sep}{\@theoremsep}% + \cslet{jmlr@thm@#1@postheader}{\@theorempostheader}% + \jmlr@org@newtheorem{#1}% +} +\renewcommand*{\@xthm}[2]{% + \def\@jmlr@currentthm{#1}% + \@begintheorem{#2}{\csname the#1\endcsname}% + \ignorespaces +} +\def\@ythm#1#2[#3]{% + \def\@jmlr@currentthm{#1}% + \@opargbegintheorem{#2}{\csname the#1\endcsname}{#3}% + \ignorespaces +} +\renewcommand*{\@begintheorem}[2]{% + \ifdef{\@jmlr@currentthm}% + {% + \letcs{\jmlr@this@theoremheader}{jmlr@thm@\@jmlr@currentthm @header@font}% + \letcs{\jmlr@this@theorembody}{jmlr@thm@\@jmlr@currentthm @body@font}% + \letcs{\jmlr@this@theoremsep}{jmlr@thm@\@jmlr@currentthm @sep}% + \letcs{\jmlr@this@theorempostheader}% + {jmlr@thm@\@jmlr@currentthm @postheader}% + }% + {% + \let\jmlr@this@theorembody\@theorembodyfont + \let\jmlr@this@theoremheader\@theoremheaderfont + \let\jmlr@this@theoremsep\@theoremsep + \let\jmlr@this@theorempostheader\@theorempostheader + }% + \trivlist + \item + [% + \hskip\labelsep{\jmlr@this@theoremheader #1\ #2% + \jmlr@this@theorempostheader}% + ]% + \mbox{}\jmlr@this@theoremsep + \jmlr@this@theorembody +} +\renewcommand*{\@opargbegintheorem}[3]{% + \ifdef{\@jmlr@currentthm}% + {% + \letcs{\jmlr@this@theoremheader}{jmlr@thm@\@jmlr@currentthm @header@font}% + \letcs{\jmlr@this@theorembody}{jmlr@thm@\@jmlr@currentthm @body@font}% + \letcs{\jmlr@this@theoremsep}{jmlr@thm@\@jmlr@currentthm @sep}% + \letcs{\jmlr@this@theorempostheader}% + {jmlr@thm@\@jmlr@currentthm @postheader}% + }% + {% + \let\jmlr@this@theorembody\@theorembodyfont + \let\jmlr@this@theoremheader\@theoremheaderfont + \let\jmlr@this@theoremsep\@theoremsep + \let\jmlr@this@theorempostheader\@theorempostheader + }% + \trivlist + \item[\hskip\labelsep{\jmlr@this@theoremheader #1\ #2\ (#3)% + \jmlr@this@theorempostheader}]% + \mbox{}\jmlr@this@theoremsep + \jmlr@this@theorembody +} \newtheorem{example}{Example} \newtheorem{theorem}{Theorem} \newtheorem{lemma}[theorem]{Lemma} @@ -1149,6 +1254,12 @@ Keywords:} \ignorespaces}% \@ifpackageloaded{theorem}{% \ClassError{jmlr}{Package `theorem' detected.\MessageBreak This can cause a conflict with other packages used by jmlr}{}}{}% + \@ifpackageloaded{ntheorem}{% + \ClassError{jmlr}{Package `ntheorem' detected.\MessageBreak + This can cause a conflict with other packages used by jmlr}{}}{}% + \@ifpackageloaded{amsthm}{% + \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.}{}% \@ifpackageloaded{geometry}{Package `geometry' detected.\MessageBreak @@ -1166,7 +1277,7 @@ Keywords:} \ignorespaces}% } \DeclareRobustCommand*{\obsoletefontcs}[1]{% \ClassWarning{jmlr}{Obsolete command - \expandafter\string\csname#1\endcsname\space detected.}% + \expandafter\string\csname#1\endcsname\space detected}% \csname #1 \endcsname } \renewcommand*{\bf}{% diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls index 3b0f9441aae..a86e4acb494 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 2012 Nicola Talbot +%% Copyright 2013 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -41,13 +41,15 @@ %% First editor: %% Second editor: \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlrbook}[2012/05/30 v1.17 (NLCT) JMLR Book Style] +\ProvidesClass{jmlrbook}[2013/10/17 v1.18 (NLCT) JMLR Book Style] \RequirePackage{xkeyval} \RequirePackage{setspace} \RequirePackage{fink} \providecommand*{\jmlrprehyperref}{} \newif\ifgrayscale \grayscalefalse +\DeclareOptionX{draft}{\setlength\overfullrule{5pt}} +\DeclareOptionX{final}{\setlength\overfullrule{0pt}} \DeclareOptionX{color}{\grayscalefalse} \DeclareOptionX{gray}{\grayscaletrue} \DeclareOptionX{letterpaper}{\PassOptionsToClass{\CurrentOption}{jmlr}} @@ -370,6 +372,7 @@ \renewcommand*{\@logo}{#2}% \fi } +\renewcommand*{\booklinebreak}[1][4]{\linebreak[#1]} \def\c@lbmaketitle{\jmlrmaketitle} \newcommand*{\maintitle}{} \newcommand*{\SetTitleElement}[3]{% @@ -521,7 +524,7 @@ } \fi \newenvironment{authorsignoff}{% - \def\Author##1{\begin{tabular}{@{}l@{}}% + \def\Author##1{\begin{tabular}{@{}p{\linewidth}@{}}% ##1% \end{tabular}% \par\vskip\baselineskip\noindent\ignorespaces @@ -631,6 +634,7 @@ \@setimportlabel \gdef\@setimportlabel{\let\ref\Xref \let\pageref\Xpageref}% \let\ReadBookmarks\relax + \@ifundefined{@beginmainauxhook}{}{\@beginmainauxhook}% } \let\@org@InputIfFileExists\InputIfFileExists \newenvironment{jmlrpapers}{% @@ -989,10 +993,11 @@ not permitted outside `jmlrpapers' environment}{}% \newcommand*\l@chapterauthor[2]{% \ifnum \c@tocdepth >\m@ne \begingroup - \parindent \z@ \rightskip \@pnumwidth + \parindent \z@ + \rightskip \@pnumwidth \parfillskip -\@pnumwidth \leavevmode \raggedright - #1% + \parbox{\linewidth-\@pnumwidth}{\raggedright#1\par}% \par \endgroup \fi} -- cgit v1.2.3