From cf902eaabacb3ba258a35e8e461a2315c35d59e8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Dec 2010 01:14:48 +0000 Subject: jmlr 1.09 (1dec10) git-svn-id: svn://tug.org/texlive/trunk@20630 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/jmlr/jmlr.dtx | 393 +++++++++++++++++++++------ Master/texmf-dist/source/latex/jmlr/jmlr.ins | 2 +- 2 files changed, 316 insertions(+), 79 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.dtx b/Master/texmf-dist/source/latex/jmlr/jmlr.dtx index fbec9c7a355..b520db4de28 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 2010/7/27 11:45 +% Created on 2010/12/1 14:29 %\fi %\iffalse %<*package> @@ -63,7 +63,7 @@ % \author{Nicola L. C. Talbot\\[10pt] %\url{http://theoval.cmp.uea.ac.uk/~nlct/}} % -% \date{2010-07-27 (version 1.08)} +% \date{2010-12-01 (version 1.09)} % \maketitle %\tableofcontents % @@ -1523,7 +1523,7 @@ % Declare class and required TeX format: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlr}[2010/07/27 v1.08 (NLCT) Journal of Machine Learning Research] +\ProvidesClass{jmlr}[2010/12/01 v1.09 (NLCT) Journal of Machine Learning Research] % \end{macrocode} % The following conditionals are provided to make this class play nicely % with combine and aren't required for articles. @@ -1624,9 +1624,9 @@ \DeclareOption{7x10}{\viiXxtrue} \DeclareOption{letterpaper}{\PassOptionsToPackage{letterpaper}{typearea}} % \end{macrocode} -% Pass all remaining options to \cls{scrartcl} class: +% Pass all remaining options to \cls{article} class: % \begin{macrocode} -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} % \end{macrocode} % Execute required options: % \begin{macrocode} @@ -1638,7 +1638,7 @@ % \end{macrocode} % Load \cls{scrartcl} class % \begin{macrocode} -\LoadClass[pointednumbers,normalheadings]{scrartcl} +\LoadClass{article} % \end{macrocode} % Can't use \sty{geometry} package because it doesn't play nicely % with the \cls{combine} class. @@ -1703,18 +1703,62 @@ \bibpunct{(}{)}{;}{a}{,}{,} % \end{macrocode} %\subsection{Sections} +%\begin{macro}{\section} % \begin{macrocode} -\addtokomafont{section}{\rmfamily\large} -\addtokomafont{subsection}{\rmfamily\normalsize} -\addtokomafont{subsubsection}{\rmfamily\mdseries\normalsize\scshape} -\addtokomafont{paragraph}{\rmfamily\normalsize} -\addtokomafont{subparagraph}{\rmfamily\itshape\normalsize} +\renewcommand{\section}{\@startsection{section}{1}{\z@}% + {-0.24in \@plus -1ex \@minus -.2ex}% + {0.10in \@plus.2ex}% + {\normalfont\rmfamily\bfseries\large\raggedright}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\subsection} +% \begin{macrocode} +\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% + {-0.20in \@plus -1ex \@minus -.2ex}% + {0.08in \@plus .2ex}% + {\normalfont\rmfamily\bfseries\normalsize\raggedright}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\subsubsection} +% \begin{macrocode} +\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% + {-0.18in \@plus -1ex \@minus -.2ex}% + {0.08in \@plus .2ex}% + {\normalfont\normalsize\rmfamily\mdseries\scshape\raggedright}% +} % \end{macrocode} -% Insert possible prefix to section number. +%\end{macro} +%\begin{macro}{\paragraph} +% \begin{macrocode} +\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% + {1.5ex plus 0.5ex minus .2ex}% + {-1em}% + {\normalfont\normalsize\rmfamily\bfseries}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\subparagraph} +% \begin{macrocode} +\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\z@}% + {1.5ex plus 0.5ex minus .2ex}% + {-1em}% + {\normalfont\normalsize\rmfamily\bfseries\itshape}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@seccntformat} +% Redefine the way the section number appears in the section +% heading. % \begin{macrocode} -\renewcommand*{\othersectionlevelsformat}[1]{% - \csname pre#1num\endcsname\csname the#1\endcsname\autodot\enskip} +\renewcommand*\@seccntformat[1]{% + \csname pre#1num\endcsname + \csname the#1\endcsname.\enskip +} % \end{macrocode} +%\end{macro} +% %\subsection{Footnotes} % This code has been taken from jmlr2e.sty % \begin{macrocode} @@ -1731,7 +1775,11 @@ \renewenvironment{abstract}{\HCode{

}Abstract\HCode{

}}{}% \else \renewenvironment{abstract} - {\centerline{\large\bfseries Abstract}\vspace{0.7ex}% +% \end{macrocode} +%\changes{1.09}{2010/12/01}{changed \cs{centerline} to +%\cs{centering}\ldots\cs{par}} +% \begin{macrocode} + {{\centering\large\bfseries Abstract\par}\vspace{0.7ex}% \bgroup \leftskip 20pt\rightskip 20pt\small\noindent\ignorespaces}% {\par\egroup\vskip 0.25ex} @@ -1961,10 +2009,18 @@ Keywords:} \ignorespaces}% \def\jmlrposttitle{\par\end{center}\vskip\aftertitskip} % \end{macrocode} %\end{macro} +%\begin{macro}{\nametag} +%\changes{1.09}{2010/12/01}{new} +% \begin{macrocode} +\newcommand*{\nametag}[1]{} +% \end{macrocode} +%\end{macro} %\begin{macro}{\jmlrpreauthor} +%\changes{1.09}{2010/12/01}{added \cs{nametag}} % \begin{macrocode} \def\jmlrpreauthor{% \bgroup + \def\nametag##1{##1}% \def\and{\unskip\enspace{\normalfont and}\enspace}% \def\addr{\small\itshape}% \def\name{\ClassError{jmlr}{Use \string\Name{Author's Name} not \string\name}{}}% @@ -1990,13 +2046,13 @@ Keywords:} \ignorespaces}% % Parse a name. Appends forename to \cs{@forenames} and stores % surname in \cs{@surname}. % \begin{macrocode} -\def\@parsename#1 #2\@nil{% +\def\@parsename#1 #2\end@parsename{% \def\@tmp{#2}% - \ifx\@tmp\@empty + \ifx\@tmp\@nnil \def\@surname{#1}% \let\@nextparsename\@parsenamenoop \else - \@getinitial#1-\relax\relax\end + \@getinitial#1-\relax\relax\end@getinitial \ifx\@forenames\@empty \def\@forenames{#1}% \protected@edef\@initials{\@initial}% @@ -2008,15 +2064,15 @@ Keywords:} \ignorespaces}% \fi \let\@nextparsename\@parsename \fi - \@nextparsename#2\@nil + \@nextparsename#2\end@parsename } -\def\@parsenamenoop#1\@nil{} +\def\@parsenamenoop#1\end@parsename{} % \end{macrocode} %\end{macro} % %\begin{macro}{\@getinitial} % \begin{macrocode} -\def\@getinitial#1#2-#3#4\end{% +\def\@getinitial#1#2-#3#4\end@getinitial{% \def\@jmlr@tmp{#3}% \if\@jmlr@tmp\relax \def\@initial{#1.}% @@ -2035,7 +2091,8 @@ Keywords:} \ignorespaces}% \newcommand*{\Name}[1]{% \def\@forenames{}% \def\@surname{}% - \@parsename#1 \@nil + \def\nametag##1{}% + \@parsename#1 \@nil\end@parsename \ifx\@shortauthor\@empty \ifx\@sauthor\@empty \global\let\@shortauthor\@surname @@ -2052,6 +2109,7 @@ Keywords:} \ignorespaces}% \noexpand\@jmlr@authors@sep \@initials\space\@surname}% \fi + \def\nametag##1{##1}% \@name #1% } % \end{macrocode} @@ -2149,17 +2207,35 @@ Keywords:} \ignorespaces}% % % Label end page. % \begin{macrocode} -\AtEndDocument{% +\AtEndDocument{\@jmlrenddoc} +% \end{macrocode} +%\begin{macro}{\@jmlrenddoc} +% Label end page +% \begin{macrocode} +\newcommand*{\@jmlrenddoc}{% \@ifundefined{phantomsection}{}{\phantomsection}% \protected@edef\@currentlabelname{end of \@shorttitle}% \label{jmlrend}% + \global\let\@reprint\@empty } % \end{macrocode} +%\end{macro} % %\begin{macro}{\@titlefoot} +%\changes{1.09}{2010/12/01}{added \cs{@reprint}} % \begin{macrocode} \newcommand*{\@titlefoot}{\scriptsize\copyright\space\@jmlryear - \space\@jmlrauthors.\hfill} + \space\@jmlrauthors.\hfill + \@reprint +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\reprint} +%\changes{1.09}{2010/12/01}{new} +% \begin{macrocode} +\let\@reprint\@empty +\newcommand{\reprint}[1]{% + \gdef\@reprint{Reprinted with permission for JMLR#1}} % \end{macrocode} %\end{macro} % @@ -2402,7 +2478,7 @@ Keywords:} \ignorespaces}% % e.g.\ an opening bracket, and the fifth argument is text % to go after the reference number, e.g.\ a closing bracket. % \begin{macrocode} -\newcommand*{\objectref}[5]{% +\DeclareRobustCommand*{\objectref}[5]{% \let\@objectname\@empty \def\@objectref{}% \let\@prevsep\@empty @@ -2549,6 +2625,16 @@ Keywords:} \ignorespaces}% } % \end{macrocode} %\end{macro} +%\begin{macro}{\algocfconts} +%\changes{1.09}{2010/12/01}{new} +% \begin{macrocode} +\newcommand{\algocfconts}[3]{% + \@algocf@pre@ruled + #2\label{#1}\kern2pt\hrule height.8pt depth0pt\kern2pt% + #3\@algocf@pre@ruled +} +% \end{macrocode} +%\end{macro} % %\begin{macro}{\includeteximage} % Provide a command like \cs{includegraphics} that includes a @@ -2625,19 +2711,19 @@ Keywords:} \ignorespaces}% % % The \env{algorithm} environment should float like a figure or table. % It should use the same counter as the \env{algorithm2e} environment. +%\changes{1.09}{2010/12/01}{caption set up so that it doesn't use a +%box} % \begin{macrocode} \newenvironment{algorithm}[1][htbp]% {% - \@algocf@init% - \@algocf@init@caption \begin{algocf}[#1]% - \@algocf@start% + \renewcommand\@makecaption[2]{% + \hskip\AlCapHSkip + \parbox[t]{\hsize}{\algocf@captiontext{##1}{##2}}% + }% }% {% - \@algocf@finish% - \@algocf@term@caption \end{algocf}% - \@algocf@term } % \end{macrocode} % @@ -2799,6 +2885,12 @@ Keywords:} \ignorespaces}% \renewcommand*{\thesubfigure}{\alph{subfigure}} % \end{macrocode} %\end{macro} +%\begin{macro}{\theHsubfigure} +%\changes{1.09}{2010/12/01}{new} +% \begin{macrocode} +\newcommand*{\theHsubfigure}{\theHfigure.\alph{subfigure}} +% \end{macrocode} +%\end{macro} %\begin{macro}{\p@subfigure} % \begin{macrocode} \renewcommand*{\p@subfigure}{\expandafter\@p@subfigure} @@ -2849,6 +2941,19 @@ Keywords:} \ignorespaces}% \newcommand*{\subfigurelabel}[1]{(\emph{#1})} % \end{macrocode} %\end{macro} +% +%\begin{macro}{\@subfloatcapbox} +% Box to store subfloat caption. +% \begin{macrocode} +\newsavebox\@subfloatcapbox +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@subfloatcontsbox} +% Box to store subfloat contents. +% \begin{macrocode} +\newsavebox\@subfloatcontsbox +% \end{macrocode} +%\end{macro} %\begin{macro}{\subfigure} % \begin{macrocode} \newcommand*{\subfigure}[1][]{% @@ -2856,18 +2961,30 @@ Keywords:} \ignorespaces}% \def\@subfigcap{#1}% \@subfigure } - +% \end{macrocode} +%\changes{1.09}{2010/12/01}{Added check to determine whether the +%subfigure caption is wider than the subfigure} +% \begin{macrocode} \newcommand*{\@subfigure}[2][b]{% \advance\c@figure by 1\relax \refstepcounter{subfigure}% - \begin{tabular}[#1]{@{}c@{}}% - #2\\ - \subfigurelabel{\thesubfigure}% + \sbox\@subfloatcapbox{\subfigurelabel{\thesubfigure}% \ifx\@subfigcap\@empty \else \space\@subfigcap + \fi}% + \sbox\@subfloatcontsbox{#2}% + \settowidth{\@tempdima}{\usebox\@subfloatcontsbox}% + \settowidth{\@tempdimb}{\usebox\@subfloatcapbox}% + \ifdim\@tempdimb>\@tempdima + \settowidth\@tempdimb{\subfigurelabel{\thesubfigure}\space}% + \addtolength{\@tempdima}{-\@tempdimb}% + \sbox\@subfloatcapbox{\subfigurelabel{\thesubfigure}\space + \parbox[t]{\@tempdima}{\@subfigcap}}% \fi - \end{tabular} + \begin{tabular}[#1]{@{}c@{}}% + \usebox\@subfloatcontsbox\\\usebox\@subfloatcapbox + \end{tabular}% \egroup } % \end{macrocode} @@ -2942,16 +3059,28 @@ Keywords:} \ignorespaces}% \def\@subtabcap{#1}% \@subtable } - +% \end{macrocode} +%\changes{1.09}{2010/12/01}{Added check to determine whether the +%subtable caption is wider than the subtable} +% \begin{macrocode} \newcommand*{\@subtable}[2][t]{% \refstepcounter{subtable}% - \begin{tabular}[#1]{@{}c@{}}% - \subtablelabel{\thesubtable}% + \sbox\@subfloatcapbox{\subtablelabel{\thesubtable}% \ifx\@subtabcap\@empty \else \space\@subtabcap + \fi}% + \sbox\@subfloatcontsbox{#2}% + \settowidth{\@tempdima}{\usebox\@subfloatcontsbox}% + \settowidth{\@tempdimb}{\usebox\@subfloatcapbox}% + \ifdim\@tempdimb>\@tempdima + \settowidth\@tempdimb{\subtablelabel{\thesubtable}\space}% + \addtolength{\@tempdima}{-\@tempdimb}% + \sbox\@subfloatcapbox{\subtablelabel{\thesubtable}\space + \parbox[t]{\@tempdima}{\@subtabcap}}% \fi - \\#2% + \begin{tabular}[#1]{@{}c@{}}% + \usebox\@subfloatcapbox\\\usebox\@subfloatcontsbox \end{tabular} } % \end{macrocode} @@ -3176,12 +3305,31 @@ Keywords:} \ignorespaces}% \@mainmatterfalse} % \end{macrocode} %\end{macro} +% +%\begin{macro}{\booktocpreamble} +%\changes{1.09}{2010/12/01}{new} +% \begin{macrocode} +\newcommand*{\booktocpreamble}{} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\booktableofcontents} % This is for the main table of contents when using % the combine class file, and is not for use in individual % articles. % \begin{macrocode} -\let\booktableofcontents\tableofcontents +\newcommand\booktableofcontents{% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \chapter*{\contentsname + \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}% + \booktocpreamble + \@starttoc{toc}% + \if@restonecol\twocolumn\fi +} % \end{macrocode} %\end{macro} %\begin{macro}{\arttableofcontents} @@ -3232,11 +3380,24 @@ Keywords:} \ignorespaces}% } % \end{macrocode} %\end{macro} +% +% Part labels +% \begin{macrocode} +\newcommand*{\@parttoclabel}{part} +% \end{macrocode} +% +%\begin{macro}{\@partapp} +%\changes{1.09}{2010/12/01}{new} +% \begin{macrocode} +\def\@partapp{\partname} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\partnumberformat} % Format of the part number (in a book) % \begin{macrocode} \newcommand{\partnumberformat}[1]{% - \Huge\bfseries \partname\nobreakspace#1\par\nobreak + \Huge\bfseries \@partapp\nobreakspace#1\par\nobreak \vskip 20\p@ } % \end{macrocode} @@ -3250,18 +3411,19 @@ Keywords:} \ignorespaces}% %\begin{macro}{\partformat} % Overall format of part % \begin{macrocode} -\renewcommand*{\partformat}{\centering} +\newcommand*{\partformat}{\centering} % \end{macrocode} %\end{macro} +% %\begin{macro}{\@bookpart} % Numbered book part format % \begin{macrocode} \def\@bookpart[#1]#2{% \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% - \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}% + \addcontentsline{toc}{\@parttoclabel}{\protect\numberline{\thepart}#1}% \else - \addcontentsline{toc}{part}{#1}% + \addcontentsline{toc}{\@parttoclabel}{#1}% \fi \markboth{}{}% {\interlinepenalty \@M @@ -3404,7 +3566,7 @@ Keywords:} \ignorespaces}% % \end{macrocode} % Declare class: % \begin{macrocode} -\ProvidesClass{jmlrbook}[2010/07/27 v1.07 (NLCT) JMLR Book Style] +\ProvidesClass{jmlrbook}[2010/12/01 v1.09 (NLCT) JMLR Book Style] % \end{macrocode} % Need \sty{xkeyval} package to have key=value class options % \begin{macrocode} @@ -3427,6 +3589,11 @@ Keywords:} \ignorespaces}% \DeclareOptionX{color}{\grayscalefalse} \DeclareOptionX{gray}{\grayscaletrue} % \end{macrocode} +% Pass \clsopt{letterpaper} and \clsopt{7x10} to \clsfmt{jmlr}. +% \begin{macrocode} +\DeclareOptionX{letterpaper}{\PassOptionsToClass{\CurrentOption}{jmlr}} +\DeclareOptionX{7x10}{\PassOptionsToClass{\CurrentOption}{jmlr}} +% \end{macrocode} % Pass \clsopt{html} and \clsopt{nohtml} to \clsfmt{jmlr}. % \begin{macrocode} \DeclareOptionX{html}{\PassOptionsToClass{\CurrentOption}{jmlr}} @@ -3591,12 +3758,6 @@ Keywords:} \ignorespaces}% % \end{macrocode} %\end{macro} % -% Part labels -% \begin{macrocode} -\newcommand*{\@parttoclabel}{part} -\newcommand*{\@partapp}{\partname} -% \end{macrocode} -% % Extra title information % \begin{macrocode} \renewcommand*\jmlrtitlehook{% @@ -3613,6 +3774,12 @@ Keywords:} \ignorespaces}% \let\@shortauthor\@empty } % \end{macrocode} +%\begin{macro}{\subtitle} +% \begin{macrocode} +\newcommand*{\@subtitle}{} +\newcommand*{\subtitle}[1]{\renewcommand*{\@subtitle}{#1}} +% \end{macrocode} +%\end{macro} %\begin{macro}{\volume} % \begin{macrocode} \newcommand*{\@volume}{\@jmlrvolume} @@ -4091,7 +4258,9 @@ Keywords:} \ignorespaces}% % start of the document when hyperref's draft mode is on. Need % to fix it. % \begin{macrocode} -\AtBeginDocument{\renewcommand\@secondoffive[5]{#2}} +\AtBeginDocument{% + \renewcommand\@secondoffive[5]{#2}% +} % \end{macrocode} %\end{macro} % @@ -4105,12 +4274,16 @@ Keywords:} \ignorespaces}% % \end{macrocode} %\end{macro} % \begin{macrocode} -\AtBeginDocument{% +\AtBeginDocument{\@jmlrbegindoc} +% \end{macrocode} +%\begin{macro}{\@jmlrbegindoc} +\newcommand*\@jmlrbegindoc{ \@setimportlabel \gdef\@setimportlabel{\let\ref\Xref \let\pageref\Xpageref}% \let\ReadBookmarks\relax } % \end{macrocode} +%\end{macro} % Imported papers modify \ics{InputIfFileExists} so save original % definition. % \begin{macrocode} @@ -4120,6 +4293,18 @@ Keywords:} \ignorespaces}% %\begin{environment}{jmlrpapers} % \begin{macrocode} \newenvironment{jmlrpapers}{% +% \end{macrocode} +%\changes{1.09}{2010/12/01}{reset start and end document hook to avoid +%problems caused by packages defining duplicate commands etc} +% \begin{macrocode} +\def\@begindocumenthook{% + \@jmlrbegindoc + \let\bibcite\c@lbNATbibcite +} +\def\@enddocumenthook{% + \@jmlrenddoc + \let\bibcite\c@lbNAT@testdef +} \begin{papers}[] % \end{macrocode} %\changes{1.07}{2010-07-30}{Added check for two column style} @@ -4189,6 +4374,31 @@ Keywords:} \ignorespaces}% % \end{macrocode} %\end{macro} % +%\begin{macro}{\jmlrpremaketitlehook} +%\changes{1.09}{2010/12/01}{Moved redefinition outside of import +%macros} +% Redefine \cs{jmlrpremaketitlehook} +% \begin{macrocode} +\def\jmlrpremaketitlehook{% + \cleardoublepage + \phantomsection + \let\@currentlabelname\@shorttitle +% \end{macrocode} +%\changes{1.09}{2010/12/01}{Moved \cs{refstepcounter} from +%\cs{jmlrmaketitlehook} to \cs{jmlrpremaketitlehook}} +% \begin{macrocode} + \refstepcounter{chapter}% +}% +% \end{macrocode} +%\end{macro} +%\begin{macrocode}{\jmlrimporthook} +% Hook just before document is imported. +%\changes{1.09}{2010/12/01}{new} +% \begin{macrocode} +\newcommand*{\jmlrimporthook}{} +% \end{macrocode} +%\end{macrocode} +% %\begin{macro}{\importpubpaper} % Import a document that has already been published. % Syntax: \cs{importpubpaper}\oarg{label}\marg{dir}\marg{file}\marg{pages} @@ -4209,7 +4419,10 @@ Keywords:} \ignorespaces}% \jmlrpages{#4}% \graphicspath{{\@importdir}}% \def\jmlrmaketitlehook{% - \refstepcounter{chapter}% +% \end{macrocode} +%\changes{1.09}{2010/12/01}{Added \cs{label} to \cs{jmlrmaketitlehook}} +% \begin{macrocode} + \label{}% \addtomaincontents{toc}% {\protect\contentsline{papertitle}{\@shorttitle}{\thepage}% {page.\thepage}}% @@ -4233,11 +4446,6 @@ Keywords:} \ignorespaces}% }% \@write@author{#1}{\@jmlrauthors}% }% - \def\jmlrpremaketitlehook{% - \cleardoublepage - \phantomsection - \let\@currentlabelname\@shorttitle - }% \def\InputIfFileExists##1##2##3{% \IfFileExists{##1}{% \@org@InputIfFileExists{##1}{##2}{##3}% @@ -4247,6 +4455,7 @@ Keywords:} \ignorespaces}% }% }% \def\Xprefix{#1}% + \jmlrimporthook \import{\@importdir\@importfile}% \def\Xprefix{}% \egroup @@ -4277,7 +4486,10 @@ not permitted outside `jmlrpapers' environment}{}% \jmlrpages{\protect\@articlepagesref}% \graphicspath{{\@importdir}}% \def\jmlrmaketitlehook{% - \refstepcounter{chapter}% +% \end{macrocode} +%\changes{1.09}{2010/12/01}{Added \cs{label} to \cs{jmlrmaketitlehook}} +% \begin{macrocode} + \label{}% \addtomaincontents{toc}% {\protect\contentsline{papertitle}{\@shorttitle}{\thepage}% {page.\thepage}}% @@ -4297,11 +4509,6 @@ not permitted outside `jmlrpapers' environment}{}% }% \@write@author{#1}{\@jmlrauthors}% }% - \def\jmlrpremaketitlehook{% - \cleardoublepage - \phantomsection - \let\@currentlabelname\@shorttitle - }% \def\InputIfFileExists##1##2##3{% \IfFileExists{##1}{% \@org@InputIfFileExists{##1}{##2}{##3}% @@ -4311,6 +4518,7 @@ not permitted outside `jmlrpapers' environment}{}% }% }% \def\Xprefix{#1}% + \jmlrimporthook \import{\@importdir\@importfile}% \def\Xprefix{}% \egroup @@ -4348,7 +4556,10 @@ not permitted outside `jmlrpapers' environment}{}% \addtomaincontents{toc}% {\protect\contentsline{papertitle}{\@shorttitle}{\thepage}% {page.\thepage}}% - \refstepcounter{chapter}% +% \end{macrocode} +%\changes{1.09}{2010/12/01}{Added \cs{label} to \cs{jmlrmaketitlehook}} +% \begin{macrocode} + \label{}% \pdfbookmark{\@shorttitle}{chapter.\thechapter}% \def\@jmlr@authors@sep{ \& }% \tocchapterauthor{\@jmlrauthors}% @@ -4360,11 +4571,6 @@ not permitted outside `jmlrpapers' environment}{}% \jmlrpublished{}% \jmlrproceedings{}{}% }% - \def\jmlrpremaketitlehook{% - \cleardoublepage - \phantomsection - \let\@currentlabelname\@shorttitle - }% \graphicspath{{\@importdir}}% \def\InputIfFileExists##1##2##3{% \IfFileExists{##1}{% @@ -4375,6 +4581,7 @@ not permitted outside `jmlrpapers' environment}{}% }% }% \def\Xprefix{#1}% + \jmlrimporthook \import{\@importdir\@importfile}% \def\Xprefix{}% \egroup @@ -4538,7 +4745,8 @@ not permitted outside `jmlrpapers' environment}{}% \ifnum \c@tocdepth >\m@ne \addpenalty{-\@highpenalty}% \vskip 1.0em \@plus\p@ - \setlength\@tempdima{5em}% + %\setlength\@tempdima{5em}% + \settowidth\@tempdima{\large\bfseries \@partapp\space MM}% \vbox{% \pagerule \begingroup @@ -4548,8 +4756,9 @@ not permitted outside `jmlrpapers' environment}{}% \advance\leftskip\@tempdima \hskip -\leftskip \renewcommand*\numberline[1]{\hb@xt@ \@tempdima - {\partname\space ##1\hfil }}% - #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss }\par + {\@partapp\space ##1\hfil }}% + #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss + \normalfont\normalsize #2}\par \penalty\@highpenalty \endgroup \pagerule @@ -4558,6 +4767,31 @@ not permitted outside `jmlrpapers' environment}{}% % \end{macrocode} %\end{macro} % +%\begin{macro}{\l@chapter} +% \begin{macrocode} +\renewcommand{\l@chapter}[2]{% + \ifnum\c@tocdepth>\m@ne + \addpenalty{-\@highpenalty}% + \vskip 1.0em \@plus \p@ + \setlength\@tempdima{2em}% + \begingroup + \parindent \z@ + \rightskip \@pnumwidth + \parfillskip -\@pnumwidth + \leavevmode \large \bfseries + \advance \leftskip \@tempdima + \hskip -\leftskip + \renewcommand*\numberline[1]{\hb@xt@ \@tempdima + {##1\hfil }}% + #1\nobreak \hfil \nobreak \hb@xt@ \@pnumwidth {\hss + \normalfont\normalsize #2}\par + \penalty \@highpenalty + \endgroup + \fi +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\l@papertitle} % \begin{macrocode} \newcommand*{\l@papertitle}[2]{% @@ -4648,21 +4882,24 @@ not permitted outside `jmlrpapers' environment}{}% % \end{macrocode} %\end{macro} %\begin{macro}{\firstpagefoot} +%\changes{1.09}{2010/12/01}{added \cs{@reprint}} % \begin{macrocode} -\newcommand{\firstpagefoot}{\hfill\thepage} +\newcommand{\firstpagefoot}{% + \@reprint\hfill\thepage +} % \end{macrocode} %\end{macro} % %\begin{macro}{\headfont} % Set the header font % \begin{macrocode} -\renewcommand*{\headfont}{\reset@font\small\scshape}% +\newcommand*{\headfont}{\reset@font\small\scshape}% % \end{macrocode} %\end{macro} %\begin{macro}{\footfont} % Set the footer font % \begin{macrocode} -\renewcommand*{\footfont}{\reset@font\small\itshape}% +\newcommand*{\footfont}{\reset@font\small\itshape}% % \end{macrocode} %\end{macro} % diff --git a/Master/texmf-dist/source/latex/jmlr/jmlr.ins b/Master/texmf-dist/source/latex/jmlr/jmlr.ins index 93b3ef85323..4cab2626ba8 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 2010/7/27 11:45 +% jmlr.ins generated using makedtx version 0.94b 2010/12/1 14:29 \input docstrip \preamble -- cgit v1.2.3