From d84ff0966ba8f4d8f07bfef6b8aaf57290f273fd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 15 May 2012 23:35:52 +0000 Subject: jmlr 1.15 (15may12) git-svn-id: svn://tug.org/texlive/trunk@26427 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/jmlr/CHANGES | 21 ++++ Master/texmf-dist/doc/latex/jmlr/INSTALL | 138 ++++++++++----------- Master/texmf-dist/doc/latex/jmlr/README | 8 +- Master/texmf-dist/doc/latex/jmlr/jmlr.pdf | Bin 350699 -> 351417 bytes .../latex/jmlr/sample-books/jmlrbook-sample.pdf | Bin 291231 -> 296855 bytes .../latex/jmlr/sample-books/proceedings-sample.pdf | Bin 1230272 -> 1220040 bytes .../doc/latex/jmlr/sample-papers/jmlr-sample.pdf | Bin 279804 -> 279817 bytes .../latex/jmlr/sample-papers/jmlrwcp-sample.pdf | Bin 278898 -> 278907 bytes Master/texmf-dist/source/latex/jmlr/jmlr.dtx | 113 ++++++++++++++--- Master/texmf-dist/source/latex/jmlr/jmlr.ins | 2 +- Master/texmf-dist/tex/latex/jmlr/jmlr.cls | 9 +- Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls | 58 +++++++-- 12 files changed, 245 insertions(+), 104 deletions(-) diff --git a/Master/texmf-dist/doc/latex/jmlr/CHANGES b/Master/texmf-dist/doc/latex/jmlr/CHANGES index afef2ddc248..a18d4c74e8a 100644 --- a/Master/texmf-dist/doc/latex/jmlr/CHANGES +++ b/Master/texmf-dist/doc/latex/jmlr/CHANGES @@ -1,3 +1,24 @@ +v1.15: + + * jmlrbook.cls + + - added 'algocf' and 'definition' counters to reset list in + \zeroextracounters + + - added \theHalgocf + + - removed dependence on \ps@headings in \ps@jmlrbook + + - added \markleft + +v1.14: + + * jmlrbook.cls + + - modified \jmlrwritepdfinfo to write book author and title + information to aux file + - fixed bug in fetching time zone information + v1.13: * jmlrbook.cls diff --git a/Master/texmf-dist/doc/latex/jmlr/INSTALL b/Master/texmf-dist/doc/latex/jmlr/INSTALL index 805c257c5b3..dee8b222adb 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 37f2a14109e..6233e770313 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.13 +LaTeX Class : jmlr bundle v1.15 -Last Modified : 2012-02-25 +Last Modified : 2012-05-12 Author : Nicola L. C. Talbot @@ -70,5 +70,9 @@ This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. +RELATED SOFTWARE: + +http://www.dickimaw-books.com/apps/makejmlrbookgui/ + Author's home page: http://theoval.cmp.uea.ac.uk/~nlct/ diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf index e50213df9b8..28f39b1c746 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 8117486b891..9979f67d82f 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 81fc7b60733..b266987aa4d 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-papers/jmlr-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf index fdebf681b6a..86e949b3c9b 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/jmlrwcp-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf index c7017c011e5..92dfee58f13 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/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 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}}% -- cgit v1.2.3