From 9d9ff6bbeeec5a1b747d4c4bb9478fb2b7889ae6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 24 Feb 2015 23:10:45 +0000 Subject: jmlr (24feb15) git-svn-id: svn://tug.org/texlive/trunk@36370 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/jmlr/CHANGES | 13 ++ Master/texmf-dist/doc/latex/jmlr/README | 29 ++--- Master/texmf-dist/doc/latex/jmlr/jmlr.pdf | Bin 536368 -> 539939 bytes .../latex/jmlr/sample-books/jmlrbook-sample.pdf | Bin 317842 -> 319055 bytes .../latex/jmlr/sample-books/proceedings-sample.pdf | Bin 417163 -> 423436 bytes .../latex/jmlr/sample-books/proceedings-sample.tex | 3 +- .../doc/latex/jmlr/sample-papers/jmlr-sample.pdf | Bin 296703 -> 308958 bytes .../doc/latex/jmlr/sample-papers/jmlr-sample.tex | 80 +++++++++--- .../latex/jmlr/sample-papers/jmlrwcp-sample.pdf | Bin 297489 -> 297733 bytes Master/texmf-dist/scripts/jmlr/makejmlrbook.bat | 3 - Master/texmf-dist/source/latex/jmlr/jmlr.dtx | 139 +++++++++++++++++---- Master/texmf-dist/source/latex/jmlr/jmlr.ins | 4 +- Master/texmf-dist/tex/latex/jmlr/jmlr.cls | 81 ++++++++++-- Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls | 10 +- 14 files changed, 277 insertions(+), 85 deletions(-) delete mode 100755 Master/texmf-dist/scripts/jmlr/makejmlrbook.bat diff --git a/Master/texmf-dist/doc/latex/jmlr/CHANGES b/Master/texmf-dist/doc/latex/jmlr/CHANGES index 98a62aa6963..599eac276d2 100644 --- a/Master/texmf-dist/doc/latex/jmlr/CHANGES +++ b/Master/texmf-dist/doc/latex/jmlr/CHANGES @@ -1,3 +1,16 @@ +v1.21: + + * jmlr.cls + + - added check for jmlr2e and pseudocode + + - fixed bug in \thanks to fix footnote marker issue if there's + more than one \thanks + + * jmlrbook.cls + + - added \nopagebreak after \@editorialteam + v1.20: * jmlrbook.cls diff --git a/Master/texmf-dist/doc/latex/jmlr/README b/Master/texmf-dist/doc/latex/jmlr/README index 474eece89d9..7bb3604893b 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.20 +LaTeX Class : jmlr bundle v1.21 -Last Modified : 2014-10-15 +Last Modified : 2015-02-24 Author : Nicola L. C. Talbot @@ -8,7 +8,6 @@ This bundle provides: * jmlr class * jmlrbook class - * makejmlrbook Perl script The jmlr class is a LaTeX2e class for articles for the Journal of Machine Learning Research (JMLR) or for the JMLR Workshop and @@ -19,12 +18,10 @@ The jmlrbook class is a LaTeX2e class that can be used to combine articles written using the jmlr class into a book. The jmlrbook class uses the combine class and the hyperref package to produce either a colour hyperlinked book for on-line viewing or a greyscale -nonhyperlinked book for printing. - -The makejmlrbook Perl script can be used to create the hyperlinked and -nonhyperlinked PDFs of a document using the jmlrbook class. It can also -create a set of HTML files that list the included papers with links -to their abstracts and the individual articles as PDFs. +nonhyperlinked book for printing. Production editors can use the +makejmlrbookgui application +(http://www.dickimaw-books.com/software/makejmlrbookgui/) to +generate the proceedings. INSTALLATION @@ -53,19 +50,7 @@ jmlrbook class requirements: xkeyval combnat setspace - fink - -If both 'pdfxa' and 'gray' options are used, jmlrbook.cls also requires: - - pdfx and FOGRA39L.icc - (Download ISOcoated_v2_330_bas.icc from - http://www.colormanagement.org/en/isoprofile.html - Rename it FOGRA39L.icc and put it in the pdfx folder) - -makejmlrbook Perl script requirements: - - Perl - TeX4ht + currfile LICENCE diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf index 728530f51de..d45545719aa 100644 Binary files a/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf and b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf differ diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf index 603e195244b..8bb0202ec48 100644 Binary files a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf and b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf index 83e727ed6ec..0e11c3b90c3 100644 Binary files a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf and b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.tex index 0b6693f21f6..f39e7bbd8cd 100644 --- a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.tex +++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.tex @@ -43,8 +43,7 @@ University of East Anglia} \begin{preface} -This is the preface. To make a standalone document for the preface -use the --extractpreface option when calling makejmlrbook. +This is the preface. \begin{signoff}{March 2010} % First editor: diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf index 87519897ff8..990ca4e1d7d 100644 Binary files a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf and b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf 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 4b2ceccff89..ac147209d6f 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,8 @@ + % use the "wcp" class option for workshop and conference + % proceedings %\documentclass[gray]{jmlr} % test grayscale version -\documentclass[tablecaption=bottom]{jmlr} + %\documentclass[tablecaption=bottom]{jmlr}% journal article + \documentclass[tablecaption=bottom,wcp]{jmlr} % W&CP article % The following packages will be automatically loaded: % amsmath, amssymb, natbib, graphicx, url, algorithm2e @@ -18,9 +21,10 @@ %\usepackage{siunitx} % The following command is just for this sample document: -\newcommand{\cs}[1]{\texttt{\char`\\#1}} +\newcommand{\cs}[1]{\texttt{\char`\\#1}}% remove this in your real article - % Define an unnumbered theorem just for this sample document: + % Define an unnumbered theorem just for this sample document for + % illustrative purposes: \theorembodyfont{\upshape} \theoremheaderfont{\scshape} \theorempostheader{:} @@ -32,10 +36,19 @@ \jmlryear{2010} \jmlrsubmitted{submission date} \jmlrpublished{publication date} +\jmlrworkshop{workshop title} % W&CP title + % The optional argument of \title is used in the header \title[Short Title]{Full Title of Article\titlebreak This Title Has A Line Break} + % Anything in the title that should appear in the main title but + % not in the article's header or the volume's table of + % contents should be placed inside \titletag{} + + %\title{Title of the Article\titletag{\thanks{Some footnote}}} + + % Use \Name{Author Name} to specify the name. % If the surname contains spaces, enclose the surname % in braces, e.g. \Name{John {Smith Jones}} similarly @@ -44,9 +57,13 @@ A Line Break} % enclose the diacritic in braces, e.g. \Name{{\'E}louise Smith} % \thanks must come after \Name{...} not inside the argument for - % example \Name{John Smith}\thanks{A note} NOT \Name{John + % example \Name{John Smith}\nametag{\thanks{A note}} NOT \Name{John % Smith\thanks{A note}} + % Anything in the name that should appear in the title but not in the + % article's header or footer or in the volume's + % table of contents should be placed inside \nametag{} + % Two authors with the same address \author{\Name{Author Name1\nametag{\thanks{A note}}} \Email{abc@sample.com}\and \Name{Author Name2} \Email{xyz@sample.com}\\ @@ -79,6 +96,7 @@ A Line Break} %} \editor{Editor's name} + %\editors{Editor One and Editor Two}% for multiple editors \begin{document} @@ -100,7 +118,12 @@ this sample document as it can help to reduce complications when combining the articles into a book. Please avoid using obsolete commands, such as \verb|\rm|, and obsolete packages, such as \textsf{epsfig}.\footnote{See -\url{http://www.ctan.org/pkg/l2tabu}} +\url{http://www.ctan.org/pkg/l2tabu}} Some packages that are known +to cause problems for the production editing process are checked for +by the \textsf{jmlr} class and will generate an error. (If you want +to know more about the production editing process, have a look at +the video tutorials for the production editors at +\url{http://www.dickimaw-books.com/software/makejmlrbookgui/videos/}.) Please also ensure that your document will compile with PDF\LaTeX. If you have an error message that's puzzling you, first check for it @@ -108,8 +131,8 @@ at the UK TUG FAQ \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex}. If that doesn't help, create a minimal working example (see \url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}) and post -to somewhere like TeX on StackExchange -(\url{http://tex.stackexchange.com/}) or the LaTeX Community Forum +to somewhere like \TeX\ on StackExchange +(\url{http://tex.stackexchange.com/}) or the \LaTeX\ Community Forum (\url{http://www.latex-community.org/forum/}). \begin{note} @@ -139,7 +162,8 @@ These are unnumbered with a running head. Always use \verb|\label| and \verb|\ref| (or one of the commands described below) when cross-referencing. For example, the next -section is Section~\ref{sec:math}. The \textsf{jmlr} class +section is Section~\ref{sec:math} but you can also refer to it using +\sectionref{sec:math}. The \textsf{jmlr} class provides some convenient cross-referencing commands: \verb|\sectionref|, \verb|\equationref|, \verb|\tableref|, \verb|\figureref|, \verb|\algorithmref|, \verb|\theoremref|, @@ -191,6 +215,10 @@ details.\footnote{Either \texttt{texdoc amsmath} or Unnumbered single-lined equations should be displayed using \verb|\[| and \verb|\]|. For example: \[E = m c^2\] +or you can use the \texttt{displaymath} environment: +\begin{displaymath} +E = m c^2 +\end{displaymath} Numbered single-line equations should be displayed using the \texttt{equation} environment. For example: \begin{equation}\label{eq:trigrule} @@ -207,14 +235,14 @@ Lars Madsen, \emph{Avoid eqnarray!} TUGboat 33(1):21--25, 2012.} For example: f(x) &= x^2 + x\label{eq:f}\\ f'(x) &= 2x + 1\label{eq:df} \end{align} -Unnumbered multi-lined equations should be displayed using the +Unnumbered multi-lined equations can be displayed using the \texttt{align*} environment. For example: \begin{align*} f(x) &= (x+1)(x-1)\\ &= x^2 - 1 \end{align*} If you want to mix numbered with unnumbered lines use the -align environment and suppress unwanted line numbers with +\texttt{align} environment and suppress unwanted line numbers with \verb|\nonumber|. For example: \begin{align} y &= x^2 + 3x - 2x + 1\nonumber\\ @@ -270,6 +298,8 @@ below the operator (like \verb|\sum|) use the starred versions \label{sec:vec} Vectors should be typeset using \cs{vec}. For example $\vec{x}$. +(The original version of \cs{vec} can also be accessed using +\cs{orgvec}, for example $\orgvec{x}$.) The \textsf{jmlr} class also provides \cs{set} to typeset a set. For example $\set{S}$. @@ -286,6 +316,12 @@ Floats are supposed to have a little extra space above and below them to make them stand out from the rest of the text. This extra spacing is put in automatically and shouldn't need modifying. +If your article will later be reprinted in the Challenges for +Machine Learning, please be aware that the CiML books use a +different paper size, so if you want to resize any images use a +scale relative to the line width (\verb|\linewidth|), text width +(\verb|\textwidth|) or text height (\verb|\textheight|). + To ensure consistency, please \emph{don't} try changing the format of the caption by doing something like: \begin{verbatim} @@ -307,6 +343,8 @@ phrases, for example: Tables should go in the \texttt{table} environment. Within this environment use \verb|\floatconts| (defined by \textsf{jmlr}) to set the caption correctly and center the table contents. +The location of the caption depends on the \verb|tablecaption| +setting in the document class options. \begin{table}[htbp] % The first argument is the label. @@ -345,12 +383,14 @@ package which provides the commands \verb|\toprule|, \end{tabular}} \end{table} -If you want vertical lines as well, you can't use the +If you really want vertical lines as well, you can't use the \textsf{booktabs} commands as there'll be some unwanted gaps. Instead you can use \LaTeX's \verb|\hline|, but the rows may appear a bit cramped. You can add extra space above or below a row using \verb|\abovestrut| and \verb|\belowstrut|. For example, -see \tableref{tab:example-hline}. +see \tableref{tab:example-hline}. However, you might want to read +the \textsf{booktabs} documentation regarding the use of vertical +lines. \begin{table}[htbp] \floatconts @@ -396,7 +436,7 @@ example: If the table is very wide but not very long, you can use the \texttt{sidewaystable} environment defined in the \textsf{rotating} package (so use \verb|\usepackage{rotating}|). -If the table is too long to fit on a page, you should use the +If the table is too long to fit on a page, you can use the \texttt{longtable} environment defined in the \textsf{longtable} package (so use \verb|\usepackage{longtable}|). @@ -437,8 +477,12 @@ If the figure is too wide to fit on the page, you can use the \texttt{sidewaysfigure} environment defined in the \textsf{rotating} package. -Don't use \verb|\graphicspath|. If the images are contained in -a subdirectory, specify this when you include the image, for +Don't use \verb|\graphicspath|.\footnote{This is specific to the +\textsf{jmlr} class, not a general recommendation. The main file +that generates the proceedings or the CiML book is typically in a +different directory to the imported articles, so it modifies the +graphics path when it imports an article.} If the images +are contained in a subdirectory, specify this when you include the image, for example \verb|\includegraphics{figures/mypic}|. \subsubsection{Sub-Figures} @@ -744,7 +788,7 @@ Another example: {\ifprint{\bfseries}{\color{red}}important text!} You can use the class option \texttt{gray} to see how the document will appear in gray scale mode. \textcolor{blue}{Colored -text} will automatically be converted to gray scale. +text} will automatically be converted to gray scale in print mode. The \textsf{jmlr} class loads the \textsf{xcolor} package, so you can also define your own colors. For example: @@ -761,7 +805,9 @@ in the \textsf{xcolor} documentation\footnote{either \section{Citations and Bibliography} \label{sec:cite} -The \textsf{jmlr} class automatically loads \textsf{natbib}. +The \textsf{jmlr} class automatically loads \textsf{natbib} +and automatically sets the bibliography style, so you don't need to +use \verb|\bibliographystyle|. This sample file has the citations defined in the accompanying BibTeX file \texttt{jmlr-sample.bib}. For a parenthetical citation use \verb|\citep|. For example diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf index 49bc2418610..712a5acba86 100644 Binary files a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf and b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf differ diff --git a/Master/texmf-dist/scripts/jmlr/makejmlrbook.bat b/Master/texmf-dist/scripts/jmlr/makejmlrbook.bat deleted file mode 100755 index e9a9fe3bce6..00000000000 --- a/Master/texmf-dist/scripts/jmlr/makejmlrbook.bat +++ /dev/null @@ -1,3 +0,0 @@ -@rem = '-*- Perl -*- -@echo off -perl -S "%~dp0makejmlrbook" %* diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx index 9cd8d215ec9..88ee0c0be28 100644 --- a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx +++ b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx @@ -1,13 +1,13 @@ %\iffalse % jmlr.dtx generated using makedtx version 1.1 (c) Nicola Talbot % Command line args: +% -doc "jmlr-manual.tex" +% -author "Nicola Talbot" % -src "jmlr.cls\Z=>jmlr.cls" % -src "jmlrbook.cls\Z=>jmlrbook.cls" -% -doc "jmlr-manual.tex" % -section "chapter" -% -author "Nicola Talbot" % jmlr -% Created on 2014/10/17 14:27 +% Created on 2015/2/24 9:38 %\fi %\iffalse %<*package> @@ -30,7 +30,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2014 Nicola Talbot, all rights reserved. +% Copyright (C) 2015 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> @@ -49,7 +49,7 @@ \doxitem{Option}{option}{package options} -\CheckSum{4791} +\CheckSum{4945} \newcommand*{\appopt}[1]{\texttt{-{}-#1}} @@ -67,7 +67,7 @@ % \author{Nicola L. C. Talbot\\[10pt] %\url{http://www.dickimaw-books.com/}} % -% \date{2014-10-15 (version 1.20)} +% \date{2015-02-24 (version 1.21)} % \maketitle %\tableofcontents % @@ -1033,15 +1033,12 @@ %\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex} % %There are also forums, mailing lists and newsgroups. For example, +%\TeX\ on StackExchange (\url{http://tex.stackexchange.com/}), %the \LaTeX\ Community (\url{http://www.latex-community.org/}), %the \texttt{texhax} mailing list %(\url{http://tug.org/mailman/listinfo/texhax}) and %\texttt{comp.text.tex} (archives available at %\url{http://groups.google.com/group/comp.text.tex/}). -%The best place for queries about the \clsfmt{jmlr} class is the -%\qt{Document Classes} section of the \LaTeX\ Community Forum, as -%there's a high chance I'll see it there and help if I can. (Emails -%directly to me tend to get lost in my overcrowded inbox.) % %Documentation for packages or classes can be found using the %\texttt{texdoc} application. For example: @@ -1696,7 +1693,7 @@ %\end{description} % %\StopEventually{\clearpage\phantomsection -% \addcontentsline{toc}{chapter}{Index}\PrintIndex +% \PrintIndex %} % % @@ -1715,7 +1712,7 @@ % Declare class and required TeX format: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlr}[2014/10/15 v1.20 (NLCT) Journal of Machine Learning Research] +\ProvidesClass{jmlr}[2015/02/24 v1.21 (NLCT) Journal of Machine Learning Research] % \end{macrocode} %\changes{1.10}{2011-01-05}{hyperref now loaded by jmlr instead of %jmlrbook} @@ -2078,12 +2075,15 @@ % \end{macrocode} %\end{macro} %\begin{macro}{\thanks} +%\changes{1.21}{2015-02-24}{added optional argument to \cs{footnotetext}} %\changes{1.10}{2011-01-05}{Modified definition of \cs{thanks}} +%Added optional argument to \cs{footnotetext} as per +%\url{http://tex.stackexchange.com/questions/229295}. % \begin{macrocode} \renewcommand*{\thanks}[1]{% \footnotemark \protected@xdef\@thanks{\@thanks - \protect\footnotetext{#1}}% + \protect\footnotetext[\arabic{footnote}]{#1}}% } % \end{macrocode} %\end{macro} @@ -3252,11 +3252,20 @@ Keywords:} \ignorespaces}% \newcommand{\BlackBox}{\rule{1.5ex}{1.5ex}} % \end{macrocode} %\end{macro} +%\begin{macro}{\jmlrQED} +%\changes{1.21}{2015-02-24}{new} +% \begin{macrocode} +\newcommand*{\jmlrQED}{\hfill\BlackBox\\[2mm]} +% \end{macrocode} +%\end{macro} %\begin{environment}{proof} % Proof environment % \begin{macrocode} -\newenvironment{proof}{\par\noindent{\bfseries\upshape - Proof\ }}{\hfill\BlackBox\\[2mm]} +\newenvironment{proof}% +{% + \par\noindent{\bfseries\upshape Proof\ }% +}% +{\jmlrQED} % \end{macrocode} %\end{environment} % @@ -3483,6 +3492,13 @@ Keywords:} \ignorespaces}% % \end{macrocode} %\end{environment} % +%\begin{macro}{\orgvec} +%\changes{1.21}{2015-02-24}{new} +%Keep a copy of original \cs{vec} in case it's wanted. +% \begin{macrocode} +\let\orgvec\vec +% \end{macrocode} +%\end{macro} %\begin{macro}{\vec} % Redefine \cs{vec} to produce a bold symbol % \begin{macrocode} @@ -4230,12 +4246,18 @@ Keywords:} \ignorespaces}% \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.}{}% + This can cause a problem for jmlrbook}{}% \@ifpackageloaded{geometry}{Package `geometry' detected.\MessageBreak - This can cause a problem for jmlrbook.}{}% + This can cause a problem for jmlrbook}{}% \@ifpackageloaded{tabularx}{% \ClassError{jmlr}{Package `tabularx' detected.\MessageBreak - This will break footnote links.}{}}{}% + This will break footnote links}{}}{}% +% \end{macrocode} +%\changes{1.21}{2015-02-24}{Added check for jmlr2e package} +% \begin{macrocode} + \@ifpackageloaded{jmlr2e}{% + \ClassError{jmlr}{Package `jmlr2e' detected.\MessageBreak + This can't be used with the jmlr class}{}}{}% } \AtBeginDocument{% \@jmlr@check@packages @@ -4311,6 +4333,72 @@ Keywords:} \ignorespaces}% } % \end{macrocode} %\end{macro} +% +%\begin{macro}{\jmlrcheckforpseudocode} +%\changes{1.21}{2015-02-24}{Added check for pseudocode package} +% Check for \sty{pseudocode} package since it conflicts with +% the \sty{algorithm} package and quite often both packages +% are used in the same book or proceedings. +% \begin{macrocode} +\providecommand*{\jmlrcheckforpseudocode}{% + \@ifpackageloaded{pseudocode}% + {% + \let\pseudoRETURN\RETURN + \let\pseudoTRUE\TRUE + \let\pseudoFALSE\FALSE + \let\pseudoAND\AND + \let\pseudoOR\OR + \let\pseudoNOT\NOT + \let\pseudoTO\TO + \let\pseudoCOMMENT\COMMENT + \let\pseudoIF\IF + \let\pseudoELSE\ELSE + \let\pseudoFOR\FOR + \let\pseudoFORALL\FORALL + \let\pseudoWHILE\WHILE + \let\pseudoREPEAT\REPEAT + \let\pseudoUNTIL\UNTIL + \let\pseudoENDFOR\ENDFOR + \let\RETURN\undefined + \let\TRUE\undefined + \let\FALSE\undefined + \let\AND\undefined + \let\OR\undefined + \let\NOT\undefined + \let\TO\undefined + \let\COMMENT\undefined + \let\IF\undefined + \let\ELSE\undefined + \let\FOR\undefined + \let\FORALL\undefined + \let\WHILE\undefined + \let\REPEAT\undefined + \let\UNTIL\undefined + \let\ENDFOR\undefined + \preto\pseudocode{% + \let\RETURN\pseudoRETURN + \let\TRUE\pseudoTRUE + \let\FALSE\pseudoFALSE + \let\AND\pseudoAND + \let\OR\pseudoOR + \let\NOT\pseudoNOT + \let\TO\pseudoTO + \let\COMMENT\pseudoCOMMENT + \let\IF\pseudoIF + \let\ELSE\pseudoELSE + \let\FOR\pseudoFOR + \let\FORALL\pseudoFORALL + \let\WHILE\pseudoWHILE + \let\REPEAT\pseudoREPEAT + \let\UNTIL\pseudoUNTIL + \let\ENDFOR\pseudoENDFOR + }% + }% + {}% +} +\jmlrcheckforpseudocode +% \end{macrocode} +%\end{macro} %\iffalse % \begin{macrocode} % @@ -4328,7 +4416,7 @@ Keywords:} \ignorespaces}% % \end{macrocode} % Declare class: % \begin{macrocode} -\ProvidesClass{jmlrbook}[2014/10/15 v1.20 (NLCT) JMLR Book Style] +\ProvidesClass{jmlrbook}[2015/02/24 v1.21 (NLCT) JMLR Book Style] % \end{macrocode} % Need \sty{xkeyval} package to have key=value class options % \begin{macrocode} @@ -4445,18 +4533,18 @@ Keywords:} \ignorespaces}% % Pass \clsopt{wcp} and \clsopt{nowcp} options to \clsfmt{jmlr} and % set preface header. %\begin{option}{wcp} +%\changes{1.21}{2015-02-24}{No longer changes preface header} % \begin{macrocode} \DeclareOptionX{wcp}{% \PassOptionsToClass{\CurrentOption}{jmlr}% - \renewcommand*{\jmlrprefaceheader}{\chapter*{\prefacename}} } % \end{macrocode} %\end{option} %\begin{option}{nowcp} +%\changes{1.21}{2015-02-24}{No longer changes preface header} % \begin{macrocode} \DeclareOptionX{nowcp}{% \PassOptionsToClass{\CurrentOption}{jmlr}% - \renewcommand*{\jmlrprefaceheader}{\chapter{\prefacename}} } % \end{macrocode} %\end{option} @@ -4805,8 +4893,6 @@ Keywords:} \ignorespaces}% \newenvironment{preface}[1][preface]% {% % \end{macrocode} -% The preface should be in the front matter, so the chapter -% numbering should automatically be suppressed. %\changes{1.19}{2014/09/29}{changed to unstarred chapter} % \begin{macrocode} \jmlrprefaceheader @@ -5292,9 +5378,12 @@ Keywords:} \ignorespaces}% \fi \ifx\@editorialteam\@empty \else - \@editorialteam:\par\vskip\baselineskip +% \end{macrocode} +%\changes{1.21}{2015-02-24}{added \cs{nopagebreak}} +% \begin{macrocode} + \@editorialteam:\nopagebreak\par\vskip\baselineskip \fi - \noindent\ignorespaces + \nopagebreak\noindent\ignorespaces }% {% } diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins index f54ada2c4ee..84b299631b6 100644 --- a/Master/texmf-dist/source/latex/jmlr/jmlr.ins +++ b/Master/texmf-dist/source/latex/jmlr/jmlr.ins @@ -1,10 +1,10 @@ -% jmlr.ins generated using makedtx version 1.1 2014/10/17 14:27 +% jmlr.ins generated using makedtx version 1.1 2015/2/24 9:38 \input docstrip \preamble jmlr.dtx - Copyright 2014 Nicola Talbot + Copyright 2015 Nicola Talbot This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls index 159d891144b..ed2197b367a 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 2014 Nicola Talbot +%% Copyright 2015 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -41,7 +41,7 @@ %% First editor: %% Second editor: \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlr}[2014/10/15 v1.20 (NLCT) Journal of Machine Learning Research] +\ProvidesClass{jmlr}[2015/02/24 v1.21 (NLCT) Journal of Machine Learning Research] \RequirePackage{xkeyval} \RequirePackage{calc} \RequirePackage{etoolbox} @@ -195,7 +195,7 @@ \renewcommand*{\thanks}[1]{% \footnotemark \protected@xdef\@thanks{\@thanks - \protect\footnotetext{#1}}% + \protect\footnotetext[\arabic{footnote}]{#1}}% } \ifjmlrhtml \renewenvironment{abstract}{\HCode{

}Abstract\HCode{

}}{}% @@ -750,8 +750,12 @@ Keywords:} \ignorespaces}% \let\appendix\artappendix \newcommand{\booklinebreak}[1][]{} \newcommand{\BlackBox}{\rule{1.5ex}{1.5ex}} -\newenvironment{proof}{\par\noindent{\bfseries\upshape - Proof\ }}{\hfill\BlackBox\\[2mm]} +\newcommand*{\jmlrQED}{\hfill\BlackBox\\[2mm]} +\newenvironment{proof}% +{% + \par\noindent{\bfseries\upshape Proof\ }% +}% +{\jmlrQED} \newcommand*{\theorembodyfont}[1]{% \renewcommand*{\@theorembodyfont}{#1}% } @@ -862,6 +866,7 @@ Keywords:} \ignorespaces}% \newtheorem{definition}[theorem]{Definition} \newtheorem{conjecture}[theorem]{Conjecture} \newtheorem{axiom}[theorem]{Axiom} +\let\orgvec\vec \renewcommand*{\vec}[1]{\boldsymbol{#1}} \newenvironment{enumerate*}% {% @@ -1279,12 +1284,15 @@ Keywords:} \ignorespaces}% \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.}{}% + This can cause a problem for jmlrbook}{}% \@ifpackageloaded{geometry}{Package `geometry' detected.\MessageBreak - This can cause a problem for jmlrbook.}{}% + This can cause a problem for jmlrbook}{}% \@ifpackageloaded{tabularx}{% \ClassError{jmlr}{Package `tabularx' detected.\MessageBreak - This will break footnote links.}{}}{}% + This will break footnote links}{}}{}% + \@ifpackageloaded{jmlr2e}{% + \ClassError{jmlr}{Package `jmlr2e' detected.\MessageBreak + This can't be used with the jmlr class}{}}{}% } \AtBeginDocument{% \@jmlr@check@packages @@ -1316,6 +1324,63 @@ Keywords:} \ignorespaces}% \renewcommand*{\tt}{% \obsoletefontcs{tt}% } +\providecommand*{\jmlrcheckforpseudocode}{% + \@ifpackageloaded{pseudocode}% + {% + \let\pseudoRETURN\RETURN + \let\pseudoTRUE\TRUE + \let\pseudoFALSE\FALSE + \let\pseudoAND\AND + \let\pseudoOR\OR + \let\pseudoNOT\NOT + \let\pseudoTO\TO + \let\pseudoCOMMENT\COMMENT + \let\pseudoIF\IF + \let\pseudoELSE\ELSE + \let\pseudoFOR\FOR + \let\pseudoFORALL\FORALL + \let\pseudoWHILE\WHILE + \let\pseudoREPEAT\REPEAT + \let\pseudoUNTIL\UNTIL + \let\pseudoENDFOR\ENDFOR + \let\RETURN\undefined + \let\TRUE\undefined + \let\FALSE\undefined + \let\AND\undefined + \let\OR\undefined + \let\NOT\undefined + \let\TO\undefined + \let\COMMENT\undefined + \let\IF\undefined + \let\ELSE\undefined + \let\FOR\undefined + \let\FORALL\undefined + \let\WHILE\undefined + \let\REPEAT\undefined + \let\UNTIL\undefined + \let\ENDFOR\undefined + \preto\pseudocode{% + \let\RETURN\pseudoRETURN + \let\TRUE\pseudoTRUE + \let\FALSE\pseudoFALSE + \let\AND\pseudoAND + \let\OR\pseudoOR + \let\NOT\pseudoNOT + \let\TO\pseudoTO + \let\COMMENT\pseudoCOMMENT + \let\IF\pseudoIF + \let\ELSE\pseudoELSE + \let\FOR\pseudoFOR + \let\FORALL\pseudoFORALL + \let\WHILE\pseudoWHILE + \let\REPEAT\pseudoREPEAT + \let\UNTIL\pseudoUNTIL + \let\ENDFOR\pseudoENDFOR + }% + }% + {}% +} +\jmlrcheckforpseudocode \endinput %% %% End of file `jmlr.cls'. diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls index 9bf6963244f..932c1c41420 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 2014 Nicola Talbot +%% Copyright 2015 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -41,7 +41,7 @@ %% First editor: %% Second editor: \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlrbook}[2014/10/15 v1.20 (NLCT) JMLR Book Style] +\ProvidesClass{jmlrbook}[2015/02/24 v1.21 (NLCT) JMLR Book Style] \RequirePackage{xkeyval} \RequirePackage{setspace} \newcommand*\jmlrprefacepath{} @@ -80,11 +80,9 @@ } \DeclareOptionX{wcp}{% \PassOptionsToClass{\CurrentOption}{jmlr}% - \renewcommand*{\jmlrprefaceheader}{\chapter*{\prefacename}} } \DeclareOptionX{nowcp}{% \PassOptionsToClass{\CurrentOption}{jmlr}% - \renewcommand*{\jmlrprefaceheader}{\chapter{\prefacename}} } \DeclareOptionX{tablecaptiontop}{\PassOptionsToClass{\CurrentOption}{jmlr}} \DeclareOptionX{tablecaptionbottom}{\PassOptionsToClass{\CurrentOption}{jmlr}} @@ -552,9 +550,9 @@ \fi \ifx\@editorialteam\@empty \else - \@editorialteam:\par\vskip\baselineskip + \@editorialteam:\nopagebreak\par\vskip\baselineskip \fi - \noindent\ignorespaces + \nopagebreak\noindent\ignorespaces }% {% } -- cgit v1.2.3