summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/CHANGES10
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/README4
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/jmlr.pdfbin351417 -> 351167 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdfbin296855 -> 295726 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdfbin1220040 -> 1220040 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdfbin279817 -> 279817 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdfbin278907 -> 278907 bytes
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.dtx26
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.ins2
-rw-r--r--Master/texmf-dist/tex/latex/jmlr/jmlr.cls3
-rw-r--r--Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls7
11 files changed, 42 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/jmlr/CHANGES b/Master/texmf-dist/doc/latex/jmlr/CHANGES
index a18d4c74e8a..6e32e6bedbf 100644
--- a/Master/texmf-dist/doc/latex/jmlr/CHANGES
+++ b/Master/texmf-dist/doc/latex/jmlr/CHANGES
@@ -1,3 +1,13 @@
+v1.16:
+
+ * jmlr.cls
+
+ - added \@post@hyperref hook
+
+ * jmlrbook.cls
+
+ - added code to deal with \c@lenddoca clash
+
v1.15:
* jmlrbook.cls
diff --git a/Master/texmf-dist/doc/latex/jmlr/README b/Master/texmf-dist/doc/latex/jmlr/README
index 6233e770313..c84e61ba3e6 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.15
+LaTeX Class : jmlr bundle v1.16
-Last Modified : 2012-05-12
+Last Modified : 2012-05-16
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 28f39b1c746..245532cdd94 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 9979f67d82f..6d0ece6bb03 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/proceedings-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
index b266987aa4d..52111d2e2af 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-papers/jmlr-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
index 86e949b3c9b..52132fafa49 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 92dfee58f13..e3ce11c80c5 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 d0e9b2e9449..7aaeae520dc 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 2012/5/15 15:06
+% Created on 2012/5/16 8:16
%\fi
%\iffalse
%<*package>
@@ -49,7 +49,7 @@
\doxitem{Option}{option}{package options}
-\CheckSum{4294}
+\CheckSum{4403}
\OnlyDescription
\newcommand*{\appopt}[1]{\texttt{-{}-#1}}
@@ -67,7 +67,7 @@
% \author{Nicola L. C. Talbot\\[10pt]
%\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
%
-% \date{2012-05-12 (version 1.15)}
+% \date{2012-05-16 (version 1.16)}
% \maketitle
%\tableofcontents
%
@@ -1593,7 +1593,7 @@
% Declare class and required TeX format:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2012/05/12 v1.15 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2012/05/16 v1.16 (NLCT) Journal of Machine Learning Research]
% \end{macrocode}
%\changes{1.10}{2011-01-05}{hyperref now loaded by jmlr instead of
%jmlrbook}
@@ -1797,6 +1797,12 @@
\usepackage{hyperref}
\usepackage{nameref}
% \end{macrocode}
+% \begin{macrocode}
+% Do stuff that has to come immediately after \sty{hyperref} and
+% \sty{nameref} are loaded:
+%\changes{1.16}{2012/05/15}{added \cs{@post@hyperref}}
+\@ifundefined{@post@hyperref}{}{\@post@hyperref}
+% \end{macrocode}
% Set up hyperref options:
% \begin{macrocode}
\hypersetup{colorlinks,
@@ -3849,7 +3855,7 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
% Declare class:
% \begin{macrocode}
-\ProvidesClass{jmlrbook}[2012/05/12 v1.15 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2012/05/16 v1.16 (NLCT) JMLR Book Style]
% \end{macrocode}
% Need \sty{xkeyval} package to have key=value class options
% \begin{macrocode}
@@ -4183,12 +4189,22 @@ Keywords:} \ignorespaces}%
\newcommand*{\jmlrbook@info}[2]{}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\@post@hyperref}
+%\changes{1.16}{2012/05/15}{new}
+% \begin{macrocode}
+\newcommand*{\@post@hyperref}{%
+ \let\@org@c@lenddoca\c@lenddoca
+ \let\c@lenddoca\undefined
+}
+% \end{macrocode}
+%\end{macro}
%
% Load \cls{combine} class. This requires a little bit of trickery.
% \begin{macrocode}
\let\@org@LoadClass\LoadClass
\def\LoadClass#1{\let\LoadClass\@org@LoadClass\@org@LoadClass{jmlr}}
\@org@LoadClass{combine}
+\let\c@lenddoca\@org@c@lenddoca
% \end{macrocode}
% Requires \sty{combnat} to work with \sty{natbib}:
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
index 8269660c27f..af6c772ff58 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 2012/5/15 15:06
+% jmlr.ins generated using makedtx version 0.94b 2012/5/16 8:16
\input docstrip
\preamble
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
index 257a6aaaf92..9ad9c278933 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}[2012/05/12 v1.15 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2012/05/16 v1.16 (NLCT) Journal of Machine Learning Research]
\RequirePackage{xkeyval}
\providecommand*{\jmlrprehyperref}{}
\newif\if@openright
@@ -129,6 +129,7 @@
\@ifundefined{@pre@hyperref}{}{\@pre@hyperref}
\usepackage{hyperref}
\usepackage{nameref}
+\@ifundefined{@post@hyperref}{}{\@post@hyperref}
\hypersetup{colorlinks,
linkcolor=blue,
citecolor=blue,
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
index a874e507893..9ac00e3bd4f 100644
--- a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
+++ b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
@@ -41,7 +41,7 @@
%% First editor:
%% Second editor:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlrbook}[2012/05/12 v1.15 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2012/05/16 v1.16 (NLCT) JMLR Book Style]
\RequirePackage{xkeyval}
\RequirePackage{setspace}
\RequirePackage{fink}
@@ -236,9 +236,14 @@
\fi
\fi
\newcommand*{\jmlrbook@info}[2]{}
+\newcommand*{\@post@hyperref}{%
+ \let\@org@c@lenddoca\c@lenddoca
+ \let\c@lenddoca\undefined
+}
\let\@org@LoadClass\LoadClass
\def\LoadClass#1{\let\LoadClass\@org@LoadClass\@org@LoadClass{jmlr}}
\@org@LoadClass{combine}
+\let\c@lenddoca\@org@c@lenddoca
\RequirePackage{combnat}
\renewcommand\c@laNAT@parse[1]{{%
\let\protect=\@unexpandable@protect\let~\relax