summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-10-17 22:03:50 +0000
committerKarl Berry <karl@freefriends.org>2014-10-17 22:03:50 +0000
commit1c8b8bbccba9cf74ffbc49bf62cf52a95d2f5964 (patch)
tree849e02a7b8200ce4da88bf2ffe325f3e5f88612f
parente4be7587df5492162d7adfe6879775b191974ccc (diff)
jmlr (17oct14)
git-svn-id: svn://tug.org/texlive/trunk@35393 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/CHANGES6
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/INSTALL138
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/README4
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/jmlr.pdfbin533707 -> 536368 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdfbin318138 -> 317842 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.tex7
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdfbin418803 -> 417163 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.tex17
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdfbin296703 -> 296703 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdfbin297489 -> 297489 bytes
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.dtx177
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.ins2
-rw-r--r--Master/texmf-dist/tex/latex/jmlr/jmlr.cls22
-rw-r--r--Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls62
14 files changed, 307 insertions, 128 deletions
diff --git a/Master/texmf-dist/doc/latex/jmlr/CHANGES b/Master/texmf-dist/doc/latex/jmlr/CHANGES
index 9bf8b46a27f..98a62aa6963 100644
--- a/Master/texmf-dist/doc/latex/jmlr/CHANGES
+++ b/Master/texmf-dist/doc/latex/jmlr/CHANGES
@@ -1,3 +1,9 @@
+v1.20:
+
+ * jmlrbook.cls
+
+ - added \jmlrprefaceheader, \jmlrlocation
+
v1.19:
* jmlrbook.cls
diff --git a/Master/texmf-dist/doc/latex/jmlr/INSTALL b/Master/texmf-dist/doc/latex/jmlr/INSTALL
index dee8b222adb..805c257c5b3 100644
--- a/Master/texmf-dist/doc/latex/jmlr/INSTALL
+++ b/Master/texmf-dist/doc/latex/jmlr/INSTALL
@@ -1,69 +1,69 @@
-INSTALLATION
-
-If you have downloaded the jmlr bundle using the TeX Directory
-Structure (TDS), that is you have downloaded the archive
-jmlr.tds.zip containing doc, tex and source directories, you need to
-follow the "Installing from TDS" instructions below.
-
-If you have downloaded the following files:
-
-jmlr.dtx
-jmlr.ins
-
-You need to follow the "Installing from DTX and INS" instructions
-below.
-
-For further information on installing LaTeX packages see:
-
-http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings
-
-INSTALLING FROM TDS
-===================
-
-Files in tex and doc directories should go in the corresponding
-TEXMF directories (for example, /usr/share/texmf-local/ or
-C:\localtexmf\).
-
-*Remember to refresh TeX's database*
-
-Example (on UNIX like systems):
-
-unzip jmlr.tds.zip -d ~/texmf/
-texhash ~/texmf/
-
-Move the makejmlrbook Perl script from scripts/jmlr/ to somewhere
-on your path. If you are using Windows, you will also need to
-move makejmlrbook.bat to the same location.
-
-INSTALLING FROM DTX AND INS
-===========================
-
-Run LaTeX on jmlr.ins to generate jmlr.cls and jmlrbook.cls:
-
-latex jmlr.ins
-
-To create the documentation (jmlr.pdf):
-
-pdflatex jmlr.dtx
-makeindex -s gind.ist jmlr.idx
-makeindex -s gglo.ist -o jmlr.gls jmlr.glo
-pdflatex jmlr.dtx
-pdflatex jmlr.dtx
-
-If TEXMF denotes the base directory of your local TeX installation (e.g.
-/usr/share/texmf-local/ or C:\localtexmf\) then create the following
-directories (if they don't already exist):
-
-TEXMF/doc/latex/jmlr
-TEXMF/tex/latex/jmlr
-
-Move the documentation to TEXMF/doc/latex/jmlr/
-
-Move jmlr.cls and jmlrbook.cls to TEXMF/tex/latex/jmlr/
-
-*Remember to refresh TeX's database*
-
-Move the makejmlrbook Perl script to somewhere on your path. If
-you are using Windows, you will also need to move makejmlrbook.bat
-to the same location.
-
+INSTALLATION
+
+If you have downloaded the jmlr bundle using the TeX Directory
+Structure (TDS), that is you have downloaded the archive
+jmlr.tds.zip containing doc, tex and source directories, you need to
+follow the "Installing from TDS" instructions below.
+
+If you have downloaded the following files:
+
+jmlr.dtx
+jmlr.ins
+
+You need to follow the "Installing from DTX and INS" instructions
+below.
+
+For further information on installing LaTeX packages see:
+
+http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings
+
+INSTALLING FROM TDS
+===================
+
+Files in tex and doc directories should go in the corresponding
+TEXMF directories (for example, /usr/share/texmf-local/ or
+C:\localtexmf\).
+
+*Remember to refresh TeX's database*
+
+Example (on UNIX like systems):
+
+unzip jmlr.tds.zip -d ~/texmf/
+texhash ~/texmf/
+
+Move the makejmlrbook Perl script from scripts/jmlr/ to somewhere
+on your path. If you are using Windows, you will also need to
+move makejmlrbook.bat to the same location.
+
+INSTALLING FROM DTX AND INS
+===========================
+
+Run LaTeX on jmlr.ins to generate jmlr.cls and jmlrbook.cls:
+
+latex jmlr.ins
+
+To create the documentation (jmlr.pdf):
+
+pdflatex jmlr.dtx
+makeindex -s gind.ist jmlr.idx
+makeindex -s gglo.ist -o jmlr.gls jmlr.glo
+pdflatex jmlr.dtx
+pdflatex jmlr.dtx
+
+If TEXMF denotes the base directory of your local TeX installation (e.g.
+/usr/share/texmf-local/ or C:\localtexmf\) then create the following
+directories (if they don't already exist):
+
+TEXMF/doc/latex/jmlr
+TEXMF/tex/latex/jmlr
+
+Move the documentation to TEXMF/doc/latex/jmlr/
+
+Move jmlr.cls and jmlrbook.cls to TEXMF/tex/latex/jmlr/
+
+*Remember to refresh TeX's database*
+
+Move the makejmlrbook Perl script to somewhere on your path. If
+you are using Windows, you will also need to move makejmlrbook.bat
+to the same location.
+
diff --git a/Master/texmf-dist/doc/latex/jmlr/README b/Master/texmf-dist/doc/latex/jmlr/README
index 33666884a92..474eece89d9 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.19
+LaTeX Class : jmlr bundle v1.20
-Last Modified : 2014-09-29
+Last Modified : 2014-10-15
Author : Nicola L. C. Talbot
diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
index dcde5ae7845..728530f51de 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-books/jmlrbook-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
index c5e096df5a0..603e195244b 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.tex
index 90e7618fd6d..465bca51f73 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.tex
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.tex
@@ -9,11 +9,8 @@
\documentclass[wcp,7x10]{jmlrbook}% on-line color version, 7inx10in
%\documentclass[wcp,gray,7x10]{jmlrbook}% print version, 7inx10in
-
- % bookmark package shouldn't be used for print version
- % (load last)
-%\ifprint{}{\usepackage{bookmark}}
-
+ % Load last
+ \ifprint{}{\usepackage{bookmark}}
% Title is added to the PDF properties. Optional argument
% is used instead, if present.
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 be66a1f92b9..83e727ed6ec 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
Binary files 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 57f7146df53..0b6693f21f6 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
@@ -8,6 +8,9 @@
\documentclass[wcp]{jmlrbook}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+
% Title is added to the PDF properties. Optional argument
% is used instead, if present.
%\title[Short Title]{Big Long Title}
@@ -20,22 +23,10 @@
\jmlrvolume{42}
\jmlryear{2010}
\jmlrworkshop{Workshop on Causality}
-
- % Write the pdf information if this is the print version and the
- % class option pdfxa has been set. Title and author should be set
- % before this.
-\jmlrwritepdfinfo
-
- % inputenc with utf8 option must come after \jmlrwritepdfinfo
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
+\jmlrlocation{Somewhere}
\logo[http://www.sampleurl.com/]{\includegraphics{bookLogo}}
- % bookmark package shouldn't be used for print version
- % (load last)
-\ifprint{}{\usepackage{bookmark}}
-
\begin{document}
\maketitle
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 c7b151bfb51..87519897ff8 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
Binary files differ
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 553265d19b7..49bc2418610 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
index 77bd3952119..9cd8d215ec9 100644
--- a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
+++ b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
@@ -7,7 +7,7 @@
% -section "chapter"
% -author "Nicola Talbot"
% jmlr
-% Created on 2014/9/29 12:01
+% Created on 2014/10/17 14:27
%\fi
%\iffalse
%<*package>
@@ -49,7 +49,7 @@
\doxitem{Option}{option}{package options}
-\CheckSum{4703}
+\CheckSum{4791}
\newcommand*{\appopt}[1]{\texttt{-{}-#1}}
@@ -67,7 +67,7 @@
% \author{Nicola L. C. Talbot\\[10pt]
%\url{http://www.dickimaw-books.com/}}
%
-% \date{2014-09-29 (version 1.19)}
+% \date{2014-10-15 (version 1.20)}
% \maketitle
%\tableofcontents
%
@@ -1200,8 +1200,12 @@
%This command may be used to name the production editor. The command
%may be omitted if not required.
%
-%See \sectionref{sec:modifytitle} for details on how to modify the
-%layout of the title page.
+%\begin{definition}[\DescribeMacro{\jmlrlocation}]
+%\cs{jmlrlocation}\marg{location}
+%\end{definition}
+%This specifies the workshop location. By default this doesn't appear
+%on the title page. See \sectionref{sec:modifytitle} for details on
+%how to modify the layout of the title page.
%
%\section{Main Book Commands}
%
@@ -1711,7 +1715,7 @@
% Declare class and required TeX format:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2014/09/29 v1.19 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2014/10/15 v1.20 (NLCT) Journal of Machine Learning Research]
% \end{macrocode}
%\changes{1.10}{2011-01-05}{hyperref now loaded by jmlr instead of
%jmlrbook}
@@ -1825,6 +1829,7 @@
}
% \end{macrocode}
%\end{macro}
+%
%\begin{macro}{\nowcp}
% \begin{macrocode}
\newcommand*{\jmlrnowcp}{%
@@ -1952,9 +1957,11 @@
plainpages=false}
% \end{macrocode}
%
-% If this is the print version, need to disable the hyperlinks:
% \begin{macrocode}
\ifgrayscale
+% \end{macrocode}
+% If this is the print version, need to disable the hyperlinks:
+% \begin{macrocode}
\hypersetup{draft}
\fi
% \end{macrocode}
@@ -2151,6 +2158,7 @@ Keywords:} \ignorespaces}%
\renewcommand*{\title}[2][\@title]{%
\def\@shorttitle{#1}%
\def\@title{#2}%
+ \protected@write\@auxout{}{\string\jmlr@title{#1}{#2}}%
\jmlrtitlehook
}
% \end{macrocode}
@@ -2169,6 +2177,13 @@ Keywords:} \ignorespaces}%
\newcommand*{\jmlrtitlehook}{}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\jmlr@title}
+%\changes{1.20}{2014/10/15}{new}
+% AUX command provided for MakeJmlrBookGUI
+% \begin{macrocode}
+\newcommand*{\jmlr@title}[2]{}
+% \end{macrocode}
+%\end{macro}
%
%\begin{macro}{\author}
% Override definition of \cs{author} to allow for an optional
@@ -2177,11 +2192,16 @@ Keywords:} \ignorespaces}%
\renewcommand*{\author}[2][]{%
\def\@author{#2}%
\def\@sauthor{#1}%
+ \def\@jmlr@aux@author{#2}\@onelevel@sanitize\@jmlr@aux@author
\ifx\@sauthor\@empty
+ \let\@jmlr@aux@sauthor\@jmlr@aux@author
\else
\let\@shortauthor\@sauthor
+ \def\@jmlr@aux@sauthor{#1}\@onelevel@sanitize\@jmlr@aux@sauthor
\fi
\jmlrauthorhook
+ \protected@write\@auxout
+ {}{\string\jmlr@author{\@jmlr@aux@sauthor}{\@jmlr@aux@author}}%
}
% \end{macrocode}
%\end{macro}
@@ -2190,6 +2210,13 @@ Keywords:} \ignorespaces}%
\newcommand*{\jmlrauthorhook}{}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\jmlr@author}
+%\changes{1.20}{2014/10/15}{new}
+% AUX command provided for MakeJmlrBookGUI
+% \begin{macrocode}
+\newcommand*{\jmlr@author}[2]{}
+% \end{macrocode}
+%\end{macro}
%
%\begin{macro}{\@shortauthor}
% \begin{macrocode}
@@ -2345,6 +2372,13 @@ Keywords:} \ignorespaces}%
}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\addr}
+%\changes{1.20}{2014/10/15}{initialised to nothing}
+% Initialise to do nothing if used outside of \cs{author}
+% \begin{macrocode}
+\newcommand{\addr}{}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\@email}
% \begin{macrocode}
\def\@email{\hfill\small\mdseries\scshape}%
@@ -2774,7 +2808,30 @@ Keywords:} \ignorespaces}%
%\end{macro}
%\begin{macro}{\jmlrworkshop}
% \begin{macrocode}
-\newcommand*{\jmlrworkshop}[1]{\renewcommand*{\@jmlrworkshop}{#1}}
+\newcommand*{\jmlrworkshop}[1]{%
+ \renewcommand*{\@jmlrworkshop}{#1}%
+ \protected@write\@auxout{}{\string\jmlr@workshop{#1}}%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\jmlr@workshop}
+%\changes{1.20}{2014/10/15}{new}
+% \begin{macrocode}
+\newcommand*{\jmlr@workshop}[1]{}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\date}
+% \begin{macrocode}
+\renewcommand*{\date}[1]{%
+ \renewcommand*{\@date}{#1}%
+ \protected@write\@auxout{}{\string\jmlr@date{#1}}%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\jmlr@date}
+%\changes{1.20}{2014/10/15}{new}
+% \begin{macrocode}
+\newcommand*{\jmlr@date}[1]{}
% \end{macrocode}
%\end{macro}
%\begin{macro}{\@jmlrauthors}
@@ -4271,7 +4328,7 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
% Declare class:
% \begin{macrocode}
-\ProvidesClass{jmlrbook}[2014/09/29 v1.19 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2014/10/15 v1.20 (NLCT) JMLR Book Style]
% \end{macrocode}
% Need \sty{xkeyval} package to have key=value class options
% \begin{macrocode}
@@ -4282,11 +4339,39 @@ Keywords:} \ignorespaces}%
\RequirePackage{setspace}
% \end{macrocode}
%
-% Requires fink package to determine if the preface is in the main
+% Path used to determine if the preface is in the main
% document or in a separate file.
+%\begin{macro}{\jmlrprefacefile}
+%\changes{1.20}{2014/10/15}{new}
+% \begin{macrocode}
+\newcommand*\jmlrprefacepath{}
+% \end{macrocode}
+%\end{macro}
+% The \sty{fink} package is now deprecated, so only use it if
+% \sty{currfile} isn't installed.
+% \begin{macrocode}
+\IfFileExists{currfile.sty}%
+{
+ \RequirePackage{currfile}
+ \renewcommand*\jmlrprefacepath{\currfilepath}
+}%
+{%
+% \end{macrocode}
%\changes{1.11}{2011-03-24}{fink package now required}
% \begin{macrocode}
-\RequirePackage{fink}
+ \RequirePackage{fink}
+ \ifdef\finkpath
+ {%
+ \renewcommand*\jmlrprefacepath{\finkpath}%
+ }
+ {%
+% \end{macrocode}
+% \sty{fink} version too old.
+% \begin{macrocode}
+ \ClassWarning{jmlrbook}{Install `currfile' package or update
+ `fink' package}
+ }
+}
% \end{macrocode}
% Some packages need to be loaded before \sty{hyperref} so provide a
% hook to do this:
@@ -4346,15 +4431,33 @@ Keywords:} \ignorespaces}%
\DeclareOptionX{nohtml}{\PassOptionsToClass{\CurrentOption}{jmlr}}
% \end{macrocode}
%\end{option}
-% Pass \clsopt{wcp} and \clsopt{nowcp} options to \clsfmt{jmlr}.
+%\begin{macro}{\jmlrprefaceheader}
+%\changes{1.20}{2014/10/15}{new}
+% \begin{macrocode}
+\newcommand*{\jmlrprefaceheader}{%
+ \phantomsection
+ \chapter*{\prefacename}%
+ \addcontentsline{toc}{chapter}{\prefacename}%
+ \markboth{\prefacename}{\prefacename}%
+}
+% \end{macrocode}
+%\end{macro}
+% Pass \clsopt{wcp} and \clsopt{nowcp} options to \clsfmt{jmlr} and
+% set preface header.
%\begin{option}{wcp}
% \begin{macrocode}
-\DeclareOptionX{wcp}{\PassOptionsToClass{\CurrentOption}{jmlr}}
+\DeclareOptionX{wcp}{%
+ \PassOptionsToClass{\CurrentOption}{jmlr}%
+ \renewcommand*{\jmlrprefaceheader}{\chapter*{\prefacename}}
+}
% \end{macrocode}
%\end{option}
%\begin{option}{nowcp}
% \begin{macrocode}
-\DeclareOptionX{nowcp}{\PassOptionsToClass{\CurrentOption}{jmlr}}
+\DeclareOptionX{nowcp}{%
+ \PassOptionsToClass{\CurrentOption}{jmlr}%
+ \renewcommand*{\jmlrprefaceheader}{\chapter{\prefacename}}
+}
% \end{macrocode}
%\end{option}
% Pass \clsopt{tablecaptiontop} and \clsopt{tablecaptionbottom} options
@@ -4419,10 +4522,10 @@ Keywords:} \ignorespaces}%
% the print version when the \clsopt{pdfxa} option is used.
%\changes{1.13}{2012/02/25}{added support for pdfx-1a}
% \begin{macrocode}
-\newcommand*{\jmlrwritepdfinfo}{%
- \protected@write\@auxout{}{\string\jmlrbook@info{\xmpAuthor}{\xmpTitle}}%
-}
\ifgrayscale
+ \newcommand*{\jmlrwritepdfinfo}{%
+ \protected@write\@auxout{}{\string\jmlrbook@info{\xmpAuthor}{\xmpTitle}}%
+ }
\ifjmlrpdfxa
\def\convertDate{\getYear}
{\catcode`\D=12
@@ -4443,9 +4546,7 @@ Keywords:} \ignorespaces}%
\def\sep{</rdf:li><rdf:li>}
\def\TextCopyright{\amp\hash x00A9;}
\def\Title#1{\gdef\xmpTitle{#1}}
- \let\xmpTitle\@empty
\def\Author#1{\gdef\xmpAuthor{#1}}
- \let\xmpAuthor\@empty
\def\Keywords#1{\gdef\xmpKeywords{#1}}
\let\xmpKeywords\@empty
\let\xmpSubject\xmpKeywords
@@ -4608,6 +4709,8 @@ Keywords:} \ignorespaces}%
%\end{macro}
% \begin{macrocode}
\fi
+\else
+ \newcommand*{\jmlrwritepdfinfo}{}
\fi
% \end{macrocode}
%
@@ -4618,6 +4721,13 @@ Keywords:} \ignorespaces}%
\newcommand*{\jmlrbook@info}[2]{}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\jmlrbook@location}
+%\changes{1.20}{2014/10/15}{new}
+% Not needed (information provided for MakeJmlrBookGUI)
+% \begin{macrocode}
+\newcommand*{\jmlrbook@location}[1]{}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\@post@hyperref}
%\changes{1.16}{2012/05/15}{new}
% \begin{macrocode}
@@ -4699,10 +4809,10 @@ Keywords:} \ignorespaces}%
% numbering should automatically be suppressed.
%\changes{1.19}{2014/09/29}{changed to unstarred chapter}
% \begin{macrocode}
- \chapter{\prefacename}
+ \jmlrprefaceheader
\protected@write\@mainauxout
{}{\string\@prefacestart{\thepage}{\arabic{page}}}%
- \protected@write\@mainauxout{}{\string\@prefacefile{\finkpath}{#1}}%
+ \protected@write\@mainauxout{}{\string\@prefacefile{\jmlrprefacepath}{#1}}%
}%
{%
\protected@write\@mainauxout{}{\string\@prefaceend{\thepage}}%
@@ -4795,24 +4905,35 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\jmlrtitlehook}
+%\changes{1.20}{2014/10/15}{changed \cs{let} to \cs{def}}
% Extra title information
% \begin{macrocode}
\renewcommand*\jmlrtitlehook{%
\hypersetup{pdftitle={\@shorttitle}}%
- \let\xmpTitle\@shorttitle
+ \def\xmpTitle{\@shorttitle}%
\let\jmlrtitlehook\relax
}
+\providecommand*{\xmpTitle}{\@title}%
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\jmlrauthorhook}
+%\changes{1.20}{2014/10/15}{changed \cs{let} to \cs{def}}
+% \begin{macrocode}
\renewcommand*\jmlrauthorhook{%
\ifx\@sauthor\@empty
\hypersetup{pdfauthor={\@author}}%
\else
\hypersetup{pdfauthor={\@sauthor}}%
\fi
- \let\xmpAuthor\@sauthor
+ \def\xmpAuthor{\@sauthor}%
\let\jmlrauthorhook\relax
\let\@shortauthor\@empty
}
+\providecommand*\xmpAuthor{\@author}%
% \end{macrocode}
+%\end{macro}
%\begin{macro}{\subtitle}
% \begin{macrocode}
\newcommand*{\@subtitle}{}
@@ -4853,6 +4974,16 @@ Keywords:} \ignorespaces}%
\newcommand*{\team}[1]{\renewcommand*{\@team}{#1}}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\jmlrlocation}
+%\changes{1.20}{2014/10/15}{new}
+% \begin{macrocode}
+\newcommand*{\@jmlrlocation}{}
+\newcommand*{\jmlrlocation}[1]{%
+ \renewcommand*{\@jmlrlocation}{#1}%
+ \protected@write\@auxout{}{\string\jmlrbook@location{#1}}%
+}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\@productioneditorname}
% \begin{macrocode}
\newcommand*{\@productioneditorname}{Production Editor}
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
index 94c27e1006c..f54ada2c4ee 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 1.1 2014/9/29 12:01
+% jmlr.ins generated using makedtx version 1.1 2014/10/17 14:27
\input docstrip
\preamble
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
index 597d72d8780..159d891144b 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}[2014/09/29 v1.19 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2014/10/15 v1.20 (NLCT) Journal of Machine Learning Research]
\RequirePackage{xkeyval}
\RequirePackage{calc}
\RequirePackage{etoolbox}
@@ -222,20 +222,28 @@ Keywords:} \ignorespaces}%
\renewcommand*{\title}[2][\@title]{%
\def\@shorttitle{#1}%
\def\@title{#2}%
+ \protected@write\@auxout{}{\string\jmlr@title{#1}{#2}}%
\jmlrtitlehook
}
\newcommand*{\@shorttitle}{\jobname}
\newcommand*{\jmlrtitlehook}{}
+\newcommand*{\jmlr@title}[2]{}
\renewcommand*{\author}[2][]{%
\def\@author{#2}%
\def\@sauthor{#1}%
+ \def\@jmlr@aux@author{#2}\@onelevel@sanitize\@jmlr@aux@author
\ifx\@sauthor\@empty
+ \let\@jmlr@aux@sauthor\@jmlr@aux@author
\else
\let\@shortauthor\@sauthor
+ \def\@jmlr@aux@sauthor{#1}\@onelevel@sanitize\@jmlr@aux@sauthor
\fi
\jmlrauthorhook
+ \protected@write\@auxout
+ {}{\string\jmlr@author{\@jmlr@aux@sauthor}{\@jmlr@aux@author}}%
}
\newcommand*{\jmlrauthorhook}{}
+\newcommand*{\jmlr@author}[2]{}
\newcommand*{\@shortauthor}{}
\newcommand*{\@firstauthor}{}
\newcommand*{\@firstsurname}{}
@@ -307,6 +315,7 @@ Keywords:} \ignorespaces}%
\@startauthor}%
\@startauthor
}
+\newcommand{\addr}{}
\def\@email{\hfill\small\mdseries\scshape}%
\def\@name{\normalsize\upshape\bfseries}%
\def\@parsename#1 #2\end@parsename{%
@@ -522,7 +531,16 @@ Keywords:} \ignorespaces}%
\providecommand*\@jmlrpublished{}
\newcommand*{\jmlrpublished}[1]{\renewcommand*{\@jmlrpublished}{#1}}
\providecommand*\@jmlrworkshop{}
-\newcommand*{\jmlrworkshop}[1]{\renewcommand*{\@jmlrworkshop}{#1}}
+\newcommand*{\jmlrworkshop}[1]{%
+ \renewcommand*{\@jmlrworkshop}{#1}%
+ \protected@write\@auxout{}{\string\jmlr@workshop{#1}}%
+}
+\newcommand*{\jmlr@workshop}[1]{}
+\renewcommand*{\date}[1]{%
+ \renewcommand*{\@date}{#1}%
+ \protected@write\@auxout{}{\string\jmlr@date{#1}}%
+}
+\newcommand*{\jmlr@date}[1]{}
\newcommand*{\@jmlrauthors}{}
\newcommand*{\@jmlr@authors}{\@jmlrauthors}
\newcommand*{\jmlrauthors}[1]{\global\def\@jmlr@authors{#1}}
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
index 4b75264a9dc..9bf6963244f 100644
--- a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
+++ b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
@@ -41,10 +41,26 @@
%% First editor:
%% Second editor:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlrbook}[2014/09/29 v1.19 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2014/10/15 v1.20 (NLCT) JMLR Book Style]
\RequirePackage{xkeyval}
\RequirePackage{setspace}
-\RequirePackage{fink}
+\newcommand*\jmlrprefacepath{}
+\IfFileExists{currfile.sty}%
+{
+ \RequirePackage{currfile}
+ \renewcommand*\jmlrprefacepath{\currfilepath}
+}%
+{%
+ \RequirePackage{fink}
+ \ifdef\finkpath
+ {%
+ \renewcommand*\jmlrprefacepath{\finkpath}%
+ }
+ {%
+ \ClassWarning{jmlrbook}{Install `currfile' package or update
+ `fink' package}
+ }
+}
\providecommand*{\jmlrprehyperref}{}
\newif\ifgrayscale
\grayscalefalse
@@ -56,8 +72,20 @@
\DeclareOptionX{7x10}{\PassOptionsToClass{\CurrentOption}{jmlr}}
\DeclareOptionX{html}{\PassOptionsToClass{\CurrentOption}{jmlr}}
\DeclareOptionX{nohtml}{\PassOptionsToClass{\CurrentOption}{jmlr}}
-\DeclareOptionX{wcp}{\PassOptionsToClass{\CurrentOption}{jmlr}}
-\DeclareOptionX{nowcp}{\PassOptionsToClass{\CurrentOption}{jmlr}}
+\newcommand*{\jmlrprefaceheader}{%
+ \phantomsection
+ \chapter*{\prefacename}%
+ \addcontentsline{toc}{chapter}{\prefacename}%
+ \markboth{\prefacename}{\prefacename}%
+}
+\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}}
\DeclareOptionX{10pt}{\PassOptionsToClass{\CurrentOption}{jmlr}}
@@ -74,10 +102,10 @@
\grayscaletrue
\fi
}
-\newcommand*{\jmlrwritepdfinfo}{%
- \protected@write\@auxout{}{\string\jmlrbook@info{\xmpAuthor}{\xmpTitle}}%
-}
\ifgrayscale
+ \newcommand*{\jmlrwritepdfinfo}{%
+ \protected@write\@auxout{}{\string\jmlrbook@info{\xmpAuthor}{\xmpTitle}}%
+ }
\ifjmlrpdfxa
\def\convertDate{\getYear}
{\catcode`\D=12
@@ -98,9 +126,7 @@
\def\sep{</rdf:li><rdf:li>}
\def\TextCopyright{\amp\hash x00A9;}
\def\Title#1{\gdef\xmpTitle{#1}}
- \let\xmpTitle\@empty
\def\Author#1{\gdef\xmpAuthor{#1}}
- \let\xmpAuthor\@empty
\def\Keywords#1{\gdef\xmpKeywords{#1}}
\let\xmpKeywords\@empty
\let\xmpSubject\xmpKeywords
@@ -236,8 +262,11 @@
}%
}
\fi
+\else
+ \newcommand*{\jmlrwritepdfinfo}{}
\fi
\newcommand*{\jmlrbook@info}[2]{}
+\newcommand*{\jmlrbook@location}[1]{}
\newcommand*{\@post@hyperref}{%
\let\@org@c@lenddoca\c@lenddoca
\let\c@lenddoca\undefined
@@ -278,10 +307,10 @@
\else
\newenvironment{preface}[1][preface]%
{%
- \chapter{\prefacename}
+ \jmlrprefaceheader
\protected@write\@mainauxout
{}{\string\@prefacestart{\thepage}{\arabic{page}}}%
- \protected@write\@mainauxout{}{\string\@prefacefile{\finkpath}{#1}}%
+ \protected@write\@mainauxout{}{\string\@prefacefile{\jmlrprefacepath}{#1}}%
}%
{%
\protected@write\@mainauxout{}{\string\@prefaceend{\thepage}}%
@@ -317,19 +346,21 @@
}
\renewcommand*\jmlrtitlehook{%
\hypersetup{pdftitle={\@shorttitle}}%
- \let\xmpTitle\@shorttitle
+ \def\xmpTitle{\@shorttitle}%
\let\jmlrtitlehook\relax
}
+\providecommand*{\xmpTitle}{\@title}%
\renewcommand*\jmlrauthorhook{%
\ifx\@sauthor\@empty
\hypersetup{pdfauthor={\@author}}%
\else
\hypersetup{pdfauthor={\@sauthor}}%
\fi
- \let\xmpAuthor\@sauthor
+ \def\xmpAuthor{\@sauthor}%
\let\jmlrauthorhook\relax
\let\@shortauthor\@empty
}
+\providecommand*\xmpAuthor{\@author}%
\newcommand*{\@subtitle}{}
\newcommand*{\subtitle}[1]{\renewcommand*{\@subtitle}{#1}}
\newcommand*{\@volume}{\@jmlrvolume}
@@ -349,6 +380,11 @@
\newcommand*{\thejmlrworkshop}{\@jmlrworkshop}
\newcommand*{\@team}{}
\newcommand*{\team}[1]{\renewcommand*{\@team}{#1}}
+\newcommand*{\@jmlrlocation}{}
+\newcommand*{\jmlrlocation}[1]{%
+ \renewcommand*{\@jmlrlocation}{#1}%
+ \protected@write\@auxout{}{\string\jmlrbook@location{#1}}%
+}
\newcommand*{\@productioneditorname}{Production Editor}
\newcommand*{\@productioneditor}{}
\newcommand*{\productioneditor}[1]{%