jmlr 1.15 (15may12)

git-svn-id: svn://tug.org/texlive/trunk@26427 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 55 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlr.cls b/Master/texmf-dist/tex/latex/jmlr/jmlr.cls
index efdfac6b0f8..257a6aaaf92 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/02/25 v1.13 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2012/05/12 v1.15 (NLCT) Journal of Machine Learning Research]
 \RequirePackage{xkeyval}
 \providecommand*{\jmlrprehyperref}{}
 \newif\if@openright
@@ -1016,7 +1016,12 @@ Keywords:} \ignorespaces}%
   \booktocpreamble
   \@starttoc{toc}%
   \booktocpostamble
-  \if@restonecol\twocolumn\fi
+  \if@restonecol
+    \twocolumn
+  \else
+    \clearpage
+  \fi
+  \@mkboth{}{}%
 }
 \let\arttableofcontents\tableofcontents
 \newcommand{\artpart}{%
diff --git a/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls b/Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls
index abeef492e1d..a874e507893 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/02/25 v1.13 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2012/05/12 v1.15 (NLCT) JMLR Book Style]
 \RequirePackage{xkeyval}
 \RequirePackage{setspace}
 \RequirePackage{fink}
@@ -72,7 +72,9 @@
     \grayscaletrue
   \fi
 }
-\newcommand*{\jmlrwritepdfinfo}{}
+\newcommand*{\jmlrwritepdfinfo}{%
+   \protected@write\@auxout{}{\string\jmlrbook@info{\xmpAuthor}{\xmpTitle}}%
+}
 \ifgrayscale
   \ifjmlrpdfxa
    \def\convertDate{\getYear}
@@ -155,12 +157,13 @@
       \let\getTZnext\doConvDate
     \else
       \let\xTZsign\TZprefix
-      \let\getTZnext\getTZm
+      \let\getTZnext\getTZhm
     \fi
     \getTZnext
   }
-  \def\getTZm '#1#2'{%
-      \edef\xTZm{#1#2}%
+  \def\getTZhm#1#2'#3#4'{%
+      \edef\xTZh{#1#2}%
+      \edef\xTZm{#3#4}%
     \doConvDate
   }
   \def\doConvDate{%
@@ -209,8 +212,15 @@
   \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)%
@@ -225,6 +235,7 @@
   }
   \fi
 \fi
+\newcommand*{\jmlrbook@info}[2]{}
 \let\@org@LoadClass\LoadClass
 \def\LoadClass#1{\let\LoadClass\@org@LoadClass\@org@LoadClass{jmlr}}
 \@org@LoadClass{combine}
@@ -308,9 +319,7 @@
   \else
     \hypersetup{pdfauthor={\@sauthor}}%
   \fi
-  \ifjmlrpdfxa
-    \let\xmpAuthor\@sauthor
-  \fi
+  \let\xmpAuthor\@sauthor
   \let\jmlrauthorhook\relax
   \let\@shortauthor\@empty
 }
@@ -502,7 +511,9 @@
 \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}}%
 }
 \renewcommand*{\contentsname}{Table of Contents}
 \def\theHalgorithm{\theHchapter.\thealgorithm}
@@ -517,6 +528,7 @@
 \def\theHfootnote{\theHchapter.\alpha{footnote}}
 \def\theHtable{\theHchapter.\arabic{table}}
 \def\theHfigure{\theHchapter.\arabic{figure}}
+\def\theHalgocf{\theHchapter.\thealgocf}
 \renewcommand*{\mailto}[1]{%
   \href{mailto:#1}{\nolinkurl{#1}}%
 }
@@ -586,6 +598,8 @@
 }
 \AtBeginDocument{%
   \renewcommand\@secondoffive[5]{#2}%
+  \jmlrwritepdfinfo
+  \let\jmlrwritepdfinfo\relax
 }
 \def\@setimportlabel{%
   \let\@mainauxout\@auxout
@@ -1006,9 +1020,33 @@ not permitted outside `jmlrpapers' environment}{}%
   \renewcommand*{\@evenfoot}{\footfont\thepage\hfill}
 }
 \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]{}%
 }
+\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}}
+}
 \renewcommand*{\morefrontmatter}{\pagestyle{jmlrbook}%
   \def\chaptermark##1{%
     \@mkboth{##1\hfill}{\hfill##1}}%