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/CHANGES | 49 ++++--- macros/latex/contrib/jmlr/README | 4 +- macros/latex/contrib/jmlr/jmlr.dtx | 143 ++++++++++++++++++--- macros/latex/contrib/jmlr/jmlr.ins | 4 +- macros/latex/contrib/jmlr/jmlr.pdf | Bin 615617 -> 617852 bytes .../contrib/jmlr/sample-books/jmlrbook-sample.pdf | Bin 319039 -> 319067 bytes .../jmlr/sample-books/proceedings-sample.pdf | Bin 419217 -> 419199 bytes .../contrib/jmlr/sample-papers/jmlr-sample.pdf | Bin 308987 -> 309456 bytes .../contrib/jmlr/sample-papers/jmlrwcp-sample.pdf | Bin 297750 -> 297814 bytes 9 files changed, 161 insertions(+), 39 deletions(-) (limited to 'macros/latex/contrib/jmlr') diff --git a/macros/latex/contrib/jmlr/CHANGES b/macros/latex/contrib/jmlr/CHANGES index 27268561ab..41a78e7693 100644 --- a/macros/latex/contrib/jmlr/CHANGES +++ b/macros/latex/contrib/jmlr/CHANGES @@ -1,18 +1,29 @@ -v1.24: +v1.25 (2020-01-17): + + * jmlr.cls: + + - Added check for graphics.sty 2019/07/01 (which now detokenizes + filename) + + * jmlrutils.sty: + + - Added \proofname + +v1.24 (2017-08-01): * moved non-class related code into new package jmlrutils.sty * fixed bug in \includeteximage -v1.23: +v1.23 (2017-03-09): * added pmlr class option -v1.22: +v1.22 (2015-04-11): * added oneside and twoside class options -v1.21: +v1.21 (2015-02-24): * jmlr.cls @@ -25,19 +36,19 @@ v1.21: - added \nopagebreak after \@editorialteam -v1.20: +v1.20 (2014-10-15): * jmlrbook.cls - added \jmlrprefaceheader, \jmlrlocation -v1.19: +v1.19 (2014-09-29): * jmlrbook.cls - changed \chapter* to \chapter in preface environment -v1.18: +v1.18 (2013-10-17): * jmlrbook.cls @@ -58,7 +69,7 @@ v1.18: - Added \theorembodyfont, \theoremheaderfont, \theorempostheader and \theoremsep -v1.17: +v1.17 (2012-05-30): * jmlr.cls @@ -79,7 +90,7 @@ v1.17: - added optional argument to \logo -v1.16: +v1.16 (2012-05-15): * jmlr.cls @@ -89,7 +100,7 @@ v1.16: - added code to deal with \c@lenddoca clash -v1.15: +v1.15 (2012-05-12): * jmlrbook.cls @@ -102,7 +113,7 @@ v1.15: - added \markleft -v1.14: +v1.14 (2012-04-24): * jmlrbook.cls @@ -110,7 +121,7 @@ v1.14: information to aux file - fixed bug in fetching time zone information -v1.13: +v1.13 (2012-02-25): * jmlrbook.cls @@ -122,7 +133,7 @@ v1.13: - added \@pre@hyperref hook -v1.12: +v1.12 (2012-01-05): * jmlr.cls @@ -163,7 +174,7 @@ v1.12: - added debugging option --noexecute -v1.11: +v1.11 (2011-03-24): * jmlr.cls @@ -193,7 +204,7 @@ v1.11: - abstract html source files now input original aux files to allow for citations. -v1.10: +v1.10 (2011-01-05): jmlr.cls @@ -236,7 +247,7 @@ v1.10: * added time stamp at the end of each of the generated html file. -v1.09: +v1.09 (2010-12-01): jmlr.cls @@ -265,16 +276,16 @@ v1.09: * Added \label to \jmlrmaketitlehook -v1.08: +v1.08 (2010-07-27): * Fixed \thanks so that the footnote symbol is raised and isn't followed by a full stop. -v1.07: +v1.07 (2010-06-30): * Added check for two column -v1.06: +v1.06 (2010-06-17): jmlr.cls diff --git a/macros/latex/contrib/jmlr/README b/macros/latex/contrib/jmlr/README index 92ce503fcf..fc8800b9eb 100644 --- a/macros/latex/contrib/jmlr/README +++ b/macros/latex/contrib/jmlr/README @@ -1,6 +1,6 @@ -LaTeX Class : jmlr bundle v1.24 +LaTeX Class : jmlr bundle v1.25 -Last Modified : 2017-08-01 +Last Modified : 2020-01-17 Author : Nicola L. C. Talbot 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@ diff --git a/macros/latex/contrib/jmlr/jmlr.ins b/macros/latex/contrib/jmlr/jmlr.ins index 0fff82ddfd..bb4ec3dbfb 100644 --- a/macros/latex/contrib/jmlr/jmlr.ins +++ b/macros/latex/contrib/jmlr/jmlr.ins @@ -1,10 +1,10 @@ -% jmlr.ins generated using makedtx version 1.2 2017/8/1 16:57 +% jmlr.ins generated using makedtx version 1.2 2020/1/17 16:46 \input docstrip \preamble jmlr.dtx - Copyright 2017 Nicola Talbot + Copyright 2020 Nicola Talbot This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/jmlr/jmlr.pdf b/macros/latex/contrib/jmlr/jmlr.pdf index 6a75b8d526..bf6565a3a1 100644 Binary files a/macros/latex/contrib/jmlr/jmlr.pdf and b/macros/latex/contrib/jmlr/jmlr.pdf differ diff --git a/macros/latex/contrib/jmlr/sample-books/jmlrbook-sample.pdf b/macros/latex/contrib/jmlr/sample-books/jmlrbook-sample.pdf index 4d2cabbda9..9dff0e770a 100644 Binary files a/macros/latex/contrib/jmlr/sample-books/jmlrbook-sample.pdf and b/macros/latex/contrib/jmlr/sample-books/jmlrbook-sample.pdf differ diff --git a/macros/latex/contrib/jmlr/sample-books/proceedings-sample.pdf b/macros/latex/contrib/jmlr/sample-books/proceedings-sample.pdf index e71265841b..2dacde7e1a 100644 Binary files a/macros/latex/contrib/jmlr/sample-books/proceedings-sample.pdf and b/macros/latex/contrib/jmlr/sample-books/proceedings-sample.pdf differ diff --git a/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.pdf b/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.pdf index 4b6c39852f..0bf2de4a70 100644 Binary files a/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.pdf and b/macros/latex/contrib/jmlr/sample-papers/jmlr-sample.pdf differ diff --git a/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.pdf b/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.pdf index 6115f7cbf2..a2207ec188 100644 Binary files a/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.pdf and b/macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.pdf differ -- cgit v1.2.3