From 1c8b8bbccba9cf74ffbc49bf62cf52a95d2f5964 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 17 Oct 2014 22:03:50 +0000 Subject: jmlr (17oct14) git-svn-id: svn://tug.org/texlive/trunk@35393 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/jmlr/jmlr.cls | 22 +++++++++- Master/texmf-dist/tex/latex/jmlr/jmlrbook.cls | 62 +++++++++++++++++++++------ 2 files changed, 69 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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{} \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]{% -- cgit v1.2.3