summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/jmlr
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-15 23:35:52 +0000
committerKarl Berry <karl@freefriends.org>2012-05-15 23:35:52 +0000
commitd84ff0966ba8f4d8f07bfef6b8aaf57290f273fd (patch)
treefd5ae7af7497c8c92824d135964f4855924fc177 /Master/texmf-dist/source/latex/jmlr
parent379dbba88ceedd2b597d64222d38f8e49622d091 (diff)
jmlr 1.15 (15may12)
git-svn-id: svn://tug.org/texlive/trunk@26427 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/jmlr')
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.dtx113
-rw-r--r--Master/texmf-dist/source/latex/jmlr/jmlr.ins2
2 files changed, 94 insertions, 21 deletions
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx
index 3b45a8cfcb1..d0e9b2e9449 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/2/25 23:22
+% Created on 2012/5/15 15:06
%\fi
%\iffalse
%<*package>
@@ -67,7 +67,7 @@
% \author{Nicola L. C. Talbot\\[10pt]
%\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
%
-% \date{2012-02-25 (version 1.13)}
+% \date{2012-05-12 (version 1.15)}
% \maketitle
%\tableofcontents
%
@@ -125,10 +125,10 @@
%articles. \sectionref{sec:makejmlrbook} describes how
%to use the \app{makejmlrbook} application.
%
-%There is also a prototype Java application that can be used as an
-%alternative to \app{makejmlrbook}, which includes diagnostic tools.
-%See \url{http://theoval.cmp.uea.ac.uk/~nlct/} for further
-%information.
+%There is also a Java application that can be used as an alternative
+%to \app{makejmlrbook}, which includes diagnostic tools. See
+%\url{http://www.dickimaw-books.com/apps/makejmlrbookgui/} for
+%further information.
%
%\section{Required Packages}
%
@@ -1501,6 +1501,12 @@
%the imported articles must use the \clsfmt{jmlr} class.
%Note that I have only tested \app{makejmlrbook} on Linux.
%
+%
+%(If you don't like using a command line script or you want to use
+%some diagnostic tools, you may prefer to use MakeJmlrBookGUI, which
+%can be downloaded from
+%\url{http://www.dickimaw-books.com/apps/makejmlrbookgui/})
+%
%On UNIX style systems, the script can be invoked from a terminal
%using:
%\begin{prompt}
@@ -1587,7 +1593,7 @@
% Declare class and required TeX format:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2012/02/25 v1.13 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2012/05/12 v1.15 (NLCT) Journal of Machine Learning Research]
% \end{macrocode}
%\changes{1.10}{2011-01-05}{hyperref now loaded by jmlr instead of
%jmlrbook}
@@ -3566,7 +3572,7 @@ Keywords:} \ignorespaces}%
%\end{macro}
%
%\begin{macro}{\booktocpostamble}
-%\changes{?}{??}{new}
+%\changes{1.14}{2012-04-24}{new}
% \begin{macrocode}
\newcommand*{\booktocpostamble}{}
% \end{macrocode}
@@ -3576,6 +3582,7 @@ Keywords:} \ignorespaces}%
% This is for the main table of contents when using
% the combine class file, and is not for use in individual
% articles.
+%\changes{1.14}{2012-04-24}{reset page headers at end of toc}
% \begin{macrocode}
\newcommand\booktableofcontents{%
\if@twocolumn
@@ -3588,7 +3595,12 @@ Keywords:} \ignorespaces}%
\booktocpreamble
\@starttoc{toc}%
\booktocpostamble
- \if@restonecol\twocolumn\fi
+ \if@restonecol
+ \twocolumn
+ \else
+ \clearpage
+ \fi
+ \@mkboth{}{}%
}
% \end{macrocode}
%\end{macro}
@@ -3837,7 +3849,7 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
% Declare class:
% \begin{macrocode}
-\ProvidesClass{jmlrbook}[2012/02/25 v1.13 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2012/05/12 v1.15 (NLCT) JMLR Book Style]
% \end{macrocode}
% Need \sty{xkeyval} package to have key=value class options
% \begin{macrocode}
@@ -3972,7 +3984,9 @@ 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}{}
+\newcommand*{\jmlrwritepdfinfo}{%
+ \protected@write\@auxout{}{\string\jmlrbook@info{\xmpAuthor}{\xmpTitle}}%
+}
\ifgrayscale
\ifjmlrpdfxa
\def\convertDate{\getYear}
@@ -4049,6 +4063,7 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
%
%\begin{macro}{\getTZh}
+%\changes{1.14}{2012-04-24}{fixed for times zones other than Z}
% This is a modification of the command from \sty{pdfx} that also
% works for zero and negative hours.
% \begin{macrocode}
@@ -4061,7 +4076,7 @@ Keywords:} \ignorespaces}%
\let\getTZnext\doConvDate
\else
\let\xTZsign\TZprefix
- \let\getTZnext\getTZm
+ \let\getTZnext\getTZhm
\fi
\getTZnext
}
@@ -4071,8 +4086,9 @@ Keywords:} \ignorespaces}%
%\begin{macro}{\getTZm}
% This is a modified version of the command from \sty{pdfx}.
% \begin{macrocode}
- \def\getTZm '#1#2'{%
- \edef\xTZm{#1#2}%
+ \def\getTZhm#1#2'#3#4'{%
+ \edef\xTZh{#1#2}%
+ \edef\xTZm{#3#4}%
\doConvDate
}
% \end{macrocode}
@@ -4132,8 +4148,15 @@ Keywords:} \ignorespaces}%
\renewcommand*{\jmlrwritepdfinfo}{%
\begingroup
\let\&=\xmpAmp
- \includexmp{pdfx-1a}%
+ \IfFileExists{pdfx-1a.xmp}{%
+ \pdfcompresslevel=0
+ \immediate\pdfobj stream attr {/Type /Metadata /Subtype /XML}
+ file{pdfx-1a.xmpi}
+ \pdfcatalog{/Metadata \the\pdflastobj\space 0 R}
+ }%
+ {}%
\endgroup
+ \protected@write\@auxout{}{\string\jmlrbook@info{\xmpAuthor}{\xmpTitle}}%
\pdfinfo{
/Author(\xmpAuthor)%
/Title(\xmpTitle)%
@@ -4153,6 +4176,14 @@ Keywords:} \ignorespaces}%
\fi
% \end{macrocode}
%
+%\begin{macro}{\jmlrbook@info}
+%\changes{1.14}{2012-04-24}{new}
+% Not needed (information provided for MakeJmlrBookGUI)
+% \begin{macrocode}
+\newcommand*{\jmlrbook@info}[2]{}
+% \end{macrocode}
+%\end{macro}
+%
% Load \cls{combine} class. This requires a little bit of trickery.
% \begin{macrocode}
\let\@org@LoadClass\LoadClass
@@ -4327,9 +4358,7 @@ Keywords:} \ignorespaces}%
\else
\hypersetup{pdfauthor={\@sauthor}}%
\fi
- \ifjmlrpdfxa
- \let\xmpAuthor\@sauthor
- \fi
+ \let\xmpAuthor\@sauthor
\let\jmlrauthorhook\relax
\let\@shortauthor\@empty
}
@@ -4681,13 +4710,16 @@ Keywords:} \ignorespaces}%
% \end{macrocode}
%\end{environment}
%
-%\begin{macro}{\seroextracounters}
+%\begin{macro}{\zeroextracounters}
% Reset counters at the start of each imported article
+%\changes{1.15}{2012/05/12}{added algocf and definition to reset}
% \begin{macrocode}
\renewcommand{\zeroextracounters}{%
\@ifundefined{c@theorem}{}{\setcounter{theorem}{0}}%
\@ifundefined{c@algorithm}{}{\setcounter{algorithm}{0}}%
+ \@ifundefined{c@algocf}{}{\setcounter{algocf}{0}}%
\@ifundefined{c@example}{}{\setcounter{example}{0}}%
+ \@ifundefined{c@definition}{}{\setcounter{definition}{0}}%
}
% \end{macrocode}
%\end{macro}
@@ -4738,6 +4770,12 @@ Keywords:} \ignorespaces}%
\def\theHfigure{\theHchapter.\arabic{figure}}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\theHalgocf}
+%\changes{1.15}{2012/05/12}{new}
+% \begin{macrocode}
+\def\theHalgocf{\theHchapter.\thealgocf}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\mailto}
% \begin{macrocode}
\renewcommand*{\mailto}[1]{%
@@ -4874,6 +4912,8 @@ Keywords:} \ignorespaces}%
% \begin{macrocode}
\AtBeginDocument{%
\renewcommand\@secondoffive[5]{#2}%
+ \jmlrwritepdfinfo
+ \let\jmlrwritepdfinfo\relax
}
% \end{macrocode}
%\end{macro}
@@ -5591,14 +5631,47 @@ not permitted outside `jmlrpapers' environment}{}%
%
%\begin{macro}{\ps@jmlrbook}
% Page style for book
+%\changes{1.15}{2012/05/12}{removed dependence on \cs{ps@headings}
+%(made consistent with article page style)}
% \begin{macrocode}
\newcommand*{\ps@jmlrbook}{%
- \ps@headings
+ \renewcommand*{\@oddfoot}{\footfont\hfill\thepage}
+ \renewcommand*{\@evenfoot}{\footfont\thepage\hfill}
+ \def\@evenhead{\headfont\leftmark\hfill}%
+ \def\@oddhead{\hfill\headfont\rightmark}%
+ \let\@mkboth\markboth
\renewcommand*{\sectionmark}[1]{}%
}
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\markleft}
+%\changes{1.15}{2012/05/12}{new}
+% Provide a command to set just the left header mark.
+% \begin{macrocode}
+\newcommand*{\markleft}[1]{%
+ \begingroup
+ \let\label\relax
+ \let\index\relax
+ \let\glossary\relax
+ \expandafter\@markleft\@themark{#1}%
+ \@temptokena
+ \expandafter{\@themark}%
+ \mark{\the\@temptokena}
+ \endgroup
+ \if@nobreak
+ \ifvmode
+ \nobreak
+ \fi
+ \fi
+}
+\newcommand*{\@markleft}[3]{%
+ \@temptokena{#2}%
+ \unrestored@protected@xdef\@themark{{#3}{\the\@temptokena}}
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\morefrontmatter}
% \begin{macrocode}
\renewcommand*{\morefrontmatter}{\pagestyle{jmlrbook}%
diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins
index 3d269036b4b..8269660c27f 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/2/25 23:22
+% jmlr.ins generated using makedtx version 0.94b 2012/5/15 15:06
\input docstrip
\preamble