From 22d3a7ddeb2b2637308cf883f9bd3590e649aa20 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 18 Jan 2020 03:01:23 +0000 Subject: CTAN sync 202001180301 --- macros/latex/contrib/jmlr/jmlr.dtx | 143 ++++++++++++++++++++++++++++++++----- 1 file changed, 127 insertions(+), 16 deletions(-) (limited to 'macros/latex/contrib/jmlr/jmlr.dtx') diff --git a/macros/latex/contrib/jmlr/jmlr.dtx b/macros/latex/contrib/jmlr/jmlr.dtx index 57d9136911..22a9621139 100644 --- a/macros/latex/contrib/jmlr/jmlr.dtx +++ b/macros/latex/contrib/jmlr/jmlr.dtx @@ -8,7 +8,7 @@ % -author "Nicola Talbot" % -section "chapter" % jmlr -% Created on 2017/8/1 16:57 +% Created on 2020/1/17 16:46 %\fi %\iffalse %<*package> @@ -31,7 +31,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2017 Nicola Talbot, all rights reserved. +% Copyright (C) 2020 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> @@ -52,7 +52,7 @@ Research (PMLR)}, \doxitem{Option}{option}{package options} -\CheckSum{5030} +\CheckSum{5241} \newcommand*{\appopt}[1]{\texttt{-{}-#1}} @@ -70,7 +70,7 @@ Research (PMLR)}, % \author{Nicola L. C. Talbot\\[10pt] %\url{http://www.dickimaw-books.com/}} % -% \date{2017-08-01 (version 1.24)} +% \date{2020-01-17 (version 1.25)} % \maketitle %\tableofcontents % @@ -1749,7 +1749,7 @@ Research (PMLR)}, %Non-class dependent code. This package is automatically loaded by %\cls{jmlr} but may be used with other classes. % \begin{macrocode} -\ProvidesPackage{jmlrutils}[2017/08/01] +\ProvidesPackage{jmlrutils}[2020/01/17 v1.25 (NLCT)] % \end{macrocode} % Package options: %\begin{macro}{\ifjmlrutilsmaths} @@ -2414,12 +2414,18 @@ Research (PMLR)}, \newcommand{\jmlrQED}{\hfill\jmlrBlackBox\par\bigskip} % \end{macrocode} %\end{macro} +%\begin{macro}{\proofname} +%\changes{1.25}{2020-01-17}{new} +% \begin{macrocode} +\providecommand{\proofname}{Proof} +% \end{macrocode} +%\end{macro} %\begin{environment}{proof} % Proof environment % \begin{macrocode} \newenvironment{proof}% {% - \par\noindent{\bfseries\upshape Proof\ }% + \par\noindent{\bfseries\upshape \proofname\ }% }% {\jmlrQED} % \end{macrocode} @@ -2670,7 +2676,7 @@ Research (PMLR)}, % Declare class and required TeX format: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlr}[2017/08/01 v1.24 (NLCT) Journal of Machine Learning Research] +\ProvidesClass{jmlr}[2020/01/17 v1.25 (NLCT) Journal of Machine Learning Research] % \end{macrocode} %\changes{1.10}{2011-01-05}{hyperref now loaded by jmlr instead of %jmlrbook} @@ -2730,7 +2736,7 @@ Research (PMLR)}, % Can't load \sty{jmlrutils} here but need the \cs{iftablecaptiontop} % conditional for the class options. %\begin{macro}{\iftablecaptiontop} -%\changes{1.07}{2010-06-17}{new} +%\changes{1.06}{2010-06-17}{new} % \begin{macrocode} \newif\iftablecaptiontop \tablecaptiontoptrue @@ -2956,7 +2962,7 @@ Research (PMLR)}, \setlength\algomargin{0pt} % \end{macrocode} %Load \sty{jmlrutils} before \sty{hyperref}. -%\changes{1.24}{??}{added \styfmt{jmlrutils}} +%\changes{1.24}{2017-08-01}{added \styfmt{jmlrutils}} % \begin{macrocode} \RequirePackage{jmlrutils} % \end{macrocode} @@ -2972,7 +2978,7 @@ Research (PMLR)}, \@ifundefined{@pre@hyperref}{}{\@pre@hyperref} % \end{macrocode} % Load \sty{hyperref}: -%\changes{1.19}{??}{replaced \cs{usepackage} with \cs{RequirePackage}} +%\changes{1.19}{2014-09-29}{replaced \cs{usepackage} with \cs{RequirePackage}} % \begin{macrocode} \RequirePackage{hyperref} \RequirePackage{nameref} @@ -3954,12 +3960,22 @@ Keywords:} \ignorespaces}% %\end{macro} % % Modify \cs{includegraphics} so that it can pick up the greyscale -% version of images if this is the print version. -%% \begin{macrocode} +% version of images if this is the print version. (Extension +% shouldn't be specified.) +% \begin{macrocode} \ifjmlrhtml \else \let\@org@Ginclude@graphics\Ginclude@graphics - \def\Ginclude@graphics#1{% +% \end{macrocode} +% Since \sty{graphics} 2019/07/01, the file name parsing has changed +% to allow for UTF-8 characters. So provide patches for the old and +% new versions and work out which one to use. +%\changes{1.25}{2020-01-17}{added check for graphics.sty version} +%\begin{macro}{\@jmlr@old@Ginclude@graphics} +%\changes{1.25}{2020-01-17}{new} +%This is a patched version of the old \cs{Ginclude@graphics}. +% \begin{macrocode} + \def\@jmlr@old@Ginclude@graphics#1{% \begingroup \let\input@path\Ginput@path \ifprint{\filename@parse{#1-gray}}{\filename@parse{#1}}% @@ -3995,6 +4011,101 @@ Keywords:} \ignorespaces}% \csname Gin@rule@\Gin@ext\endcsname{\Gin@base\Gin@ext}}% \fi \endgroup} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@jmlr@new@Ginclude@graphics} +%\changes{1.25}{2020-01-17}{new} +%This is a patch of the new version. +% \begin{macrocode} +\def\@jmlr@new@Ginclude@graphics#1{% + \ifx\detokenize\@undefined\else + \edef\Gin@extensions{\detokenize\expandafter{\Gin@extensions}}% + \fi + \begingroup + \let\input@path\Ginput@path + \ifprint{\set@curr@file{#1-gray}}{\set@curr@file{#1}}% + \expandafter\filename@parse\expandafter{\@curr@file}% + \ifx\filename@ext\Gin@gzext + \expandafter\filename@parse\expandafter{\filename@base}% + \ifx\filename@ext\relax + \let\filename@ext\Gin@gzext + \else + \edef\Gin@ext{\Gin@ext\Gin@sepdefault\Gin@gzext}% + \fi + \fi + \let\@jmlr@filename@ext\filename@ext + \ifx\filename@ext\relax + \@for\Gin@temp:=\Gin@extensions\do{% + \ifx\Gin@ext\relax + \Gin@getbase\Gin@temp + \fi}% + \ifprint + {\ifx\Gin@ext\relax + \set@curr@file{#1}% + \expandafter\filename@parse\expandafter{\@curr@file}% + \ifx\filename@ext\Gin@gzext + \expandafter\filename@parse\expandafter{\filename@base}% + \ifx\filename@ext\relax + \let\filename@ext\Gin@gzext + \else + \edef\Gin@ext{\Gin@ext\Gin@sepdefault\Gin@gzext}% + \fi + \fi + \let\@jmlr@filename@ext\filename@ext + \ifx\filename@ext\relax + \@for\Gin@temp:=\Gin@extensions\do{% + \ifx\Gin@ext\relax + \Gin@getbase\Gin@temp + \fi}% + \fi + \fi}{}% + \fi + \ifx\@jmlr@filename@ext\relax + \else + \Gin@getbase{\Gin@sepdefault\filename@ext}% + \ifx\Gin@ext\relax + \let\Gin@savedbase\filename@base + \let\Gin@savedext\filename@ext + \edef\filename@base{\filename@base\Gin@sepdefault\filename@ext}% + \let\filename@ext\relax + \@for\Gin@temp:=\Gin@extensions\do{% + \ifx\Gin@ext\relax + \Gin@getbase\Gin@temp + \fi}% + \ifx\Gin@ext\relax + \let\filename@base\Gin@savedbase + \let\filename@ext\Gin@savedext + \fi + \fi + \ifx\Gin@ext\relax + \@warning{File `#1' not found}% + \def\Gin@base{\filename@area\filename@base}% + \edef\Gin@ext{\Gin@sepdefault\filename@ext}% + \fi + \fi + \ifx\Gin@ext\relax + \@latex@error{File `#1' not found}% + {I could not locate the file with any of these extensions:^^J% + \Gin@extensions^^J\@ehc}% + \else + \@ifundefined{Gin@rule@\Gin@ext}% + {\ifx\Gin@rule@*\@undefined + \@latex@error{Unknown graphics extension: \Gin@ext}\@ehc + \else + \expandafter\Gin@setfile\Gin@rule@*{\Gin@base\Gin@ext}% + \fi}% + {\expandafter\expandafter\expandafter\Gin@setfile + \csname Gin@rule@\Gin@ext\endcsname{\Gin@base\Gin@ext}}% + \fi + \endgroup +} +% \end{macrocode} +%\end{macro} +%Determine which one to use: +% \begin{macrocode} + \@ifpackagelater{graphics}{2019/07/01} + {\let\Ginclude@graphics\@jmlr@new@Ginclude@graphics}% + {\let\Ginclude@graphics\@jmlr@old@Ginclude@graphics}% \fi % \end{macrocode} % @@ -4678,7 +4789,7 @@ Keywords:} \ignorespaces}% % \end{macrocode} % Declare class: % \begin{macrocode} -\ProvidesClass{jmlrbook}[2017/08/01 v1.24 (NLCT) JMLR Book Style] +\ProvidesClass{jmlrbook}[2020/01/17 v1.25 (NLCT) JMLR Book Style] % \end{macrocode} % Need \sty{xkeyval} package to have key=value class options % \begin{macrocode} @@ -5947,7 +6058,7 @@ Keywords:} \ignorespaces}% } \begin{papers}[] % \end{macrocode} -%\changes{1.07}{2010-07-30}{Added check for two column style} +%\changes{1.07}{2010-06-30}{Added check for two column style} % \begin{macrocode} \if@twocolumn \def\@jmlr@restore{\twocolumn}% @@ -6541,7 +6652,7 @@ not permitted outside `jmlrpapers' environment}{}% \newcommand*\l@chapterauthor[2]{% \ifnum \c@tocdepth >\m@ne % \end{macrocode} -%\changes{1.11}{2011/01/06}{removed penalty} +%\changes{1.11}{2011-03-24}{removed penalty} % \begin{macrocode} \begingroup \parindent \z@ -- cgit v1.2.3