summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/jmlr
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-07-10 00:10:37 +0000
committerKarl Berry <karl@freefriends.org>2010-07-10 00:10:37 +0000
commitb63d2ae5c39ee2fe03310842f3c72d0b76f0c42a (patch)
tree4518a5284f0b163bf72cab4935942a50c014207c /Master/texmf-dist/source/latex/jmlr
parentcb02a75d8a40f5c0f829fad0235477685f3591b8 (diff)
jmlr update (30jun10)
git-svn-id: svn://tug.org/texlive/trunk@19321 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/jmlr')
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.dtx44
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.ins2
2 files changed, 39 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
index bf62a97e559..3b6ab37ac23 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/6/17 20:52
+% Created on 2010/6/30 9:48
%\fi
%\iffalse
%<*package>
@@ -47,7 +47,7 @@
pdftitle={jmlr: LaTeX2e Classes for the Journal of Machine Learning Research},
pdfkeywords={LaTeX,jmlr}]{hyperref}
-\CheckSum{3333}
+\CheckSum{3348}
\OnlyDescription
\begin{document}
@@ -63,7 +63,7 @@
% \author{Nicola L. C. Talbot\\[10pt]
%\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
%
-% \date{2010-06-17 (version 1.06)}
+% \date{2010-06-30 (version 1.07)}
% \maketitle
%\tableofcontents
%
@@ -129,6 +129,11 @@
%Learning Research (default).
%\item[\clsopt{wcp}] The article is for JMLR Workshop and Conference
%Proceedings.
+%
+%\item[\clsopt{twocolumn}] Use two-column style.
+%
+%\item[\clsopt{onecolumn}] Use one-column style (default).
+%
%\item[\clsopt{color}] Color version (see \sectionref{sec:color}).
%
%\item[\clsopt{gray}] Grayscale version (see \sectionref{sec:color}).
@@ -1247,6 +1252,16 @@
%\end{jmlrpapers}
%\end{verbatim}
%
+%\subsubsection{Two Column Articles in a One Column Book}
+%
+%The \clsfmt{jmlrbook} class column style will override the column style
+%of the imported articles. You can use the \clsopt{twocolumn} class
+%option to \clsfmt{jmlrbook}, but this will make the whole book with
+%two columns. If you only want the imported articles to be in two
+%columns, then put \ics{twocolumn} in the \env{jmlrpapers}
+%environment to switch on two column formatting. The effect will be
+%localised to the end of the environment.
+%
%\subsubsection{Cross-Referencing}
%\label{sec:bkcrossref}
%
@@ -1508,7 +1523,7 @@
% Declare class and required TeX format:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2010/06/17 v1.06 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2010/06/30 v1.07 (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.
@@ -1821,7 +1836,15 @@ Keywords:} \ignorespaces}%
\begingroup
\def\thefootnote{\fnsymbol{footnote}}%
\def\@makefnmark{\hbox to 0pt{$^{\@thefnmark}$\hss}}%
- \@jmlrmaketitle \@thanks
+% \end{macrocode}
+%\changes{1.07}{2010-06-30}{added check for two column mode}
+% \begin{macrocode}
+ \if@twocolumn
+ \twocolumn[\@jmlrmaketitle]%
+ \else
+ \@jmlrmaketitle
+ \fi
+ \@thanks
\endgroup
\label{jmlrstart}%
\ifx\@sauthor\@empty
@@ -3347,7 +3370,7 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
% Declare class:
% \begin{macrocode}
-\ProvidesClass{jmlrbook}[2010/06/17 v1.06 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2010/06/30 v1.07 (NLCT) JMLR Book Style]
% \end{macrocode}
% Need \sty{xkeyval} package to have key=value class options
% \begin{macrocode}
@@ -4064,6 +4087,14 @@ Keywords:} \ignorespaces}%
% \begin{macrocode}
\newenvironment{jmlrpapers}{%
\begin{papers}[]
+% \end{macrocode}
+%\changes{1.07}{2010-07-30}{Added check for two column style}
+% \begin{macrocode}
+ \if@twocolumn
+ \def\@jmlr@restore{\twocolumn}%
+ \else
+ \def\@jmlr@restore{\onecolumn}%
+ \fi
\jmlrarticlecommands
\let\importpubpaper\@importpubpaper
\let\importpaper\@importpaper
@@ -4072,6 +4103,7 @@ Keywords:} \ignorespaces}%
\let\ref\Xref
\pagestyle{article}%
}{%
+ \@jmlr@restore
\end{papers}
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
index e8d06b7968a..cf5ac9a9490 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/6/17 20:52
+% jmlr.ins generated using makedtx version 0.94b 2010/6/30 9:48
\input docstrip
\preamble