From 060ee97d4bc0236c295e62058eb048e71bf79943 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 27 Dec 2021 21:14:04 +0000 Subject: asmejour (27dec21) git-svn-id: svn://tug.org/texlive/trunk@61421 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/asmejour/README.md | 5 ++- .../doc/latex/asmejour/asmejour-template.pdf | Bin 670705 -> 670642 bytes .../doc/latex/asmejour/asmejour-template.tex | 10 ++--- Master/texmf-dist/tex/latex/asmejour/asmejour.cls | 47 +++++++++++++++++---- 4 files changed, 48 insertions(+), 14 deletions(-) diff --git a/Master/texmf-dist/doc/latex/asmejour/README.md b/Master/texmf-dist/doc/latex/asmejour/README.md index 067d79afe30..32376dd7cf9 100644 --- a/Master/texmf-dist/doc/latex/asmejour/README.md +++ b/Master/texmf-dist/doc/latex/asmejour/README.md @@ -1,7 +1,7 @@ #asmejour: A template for ASME journal papers# - Version 1.16 dated 2021/12/23. + Version 1.17 dated 2021/12/26. ####Overview#### This class provides a template to format preprints in the style of journal papers published by the American Society of Mechanical Engineers. @@ -64,6 +64,9 @@ --- ####Change log#### +v1.17 (2021/12/26): + - Add code to warn about obsolete LaTeX installations. TeX Live 2020 or later is recommended for the asmejour package. + v1.16 (2021/12/23): - suppress warnings about unused options when calling mathalfa and/or barcolor - eliminate use of \\entry{} with a single argument to produce subheadings in nomenclature; use \\EntryHeading{} instead. (**not backward compatible**) diff --git a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf index 8d6ee337d44..fe57fe02e02 100644 Binary files a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf and b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf differ diff --git a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex index 9aba31970cb..f1109b714b7 100644 --- a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex +++ b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex @@ -3,7 +3,7 @@ %% %% This file is asmejour-template.tex, a template to format papers in the style of ASME journal papers. %% -%% This file is version 1.16 dated 2021/12/23 +%% This file is version 1.17 dated 2021/12/26 %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -90,7 +90,7 @@ pdftitle={ASME Journal Paper LaTeX Template}, % <=== change to YOUR pdf file title pdfkeywords={ASME journal paper, LaTeX template, BibTeX style, asmejour class},% <=== change to YOUR pdf keywords pdfsubject = {Describes the asmejour LaTeX template}, % <=== change to YOUR subject - pdfurl={https://ctan.org/pkg/asmejour},% may delete +% pdfurl={https://ctan.org/pkg/asmejour},% may delete pdflicenseurl={https://ctan.org/pkg/asmejour},% may delete } @@ -243,12 +243,12 @@ Landscape figures and tables may be produced at full-page size by putting \verb| \begin{figure*}[t] \begin{subfigure}[t]{0.5\textwidth} % You will get same result using \begin{minipage}[t]{0.5\textwidth} \vbox{ -\vspace*{1.7em} +\vspace*{1.7em}% \centering{ \includegraphics{sample-figure-2a.pdf} -} +}% \vspace*{1.7em} -} +}% \subcaption{\label{fig:interior-region}} \end{subfigure}% %%%%%%%% don't leave a break here diff --git a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls index 48c33b0ed88..f4ac5c2826c 100644 --- a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls +++ b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls @@ -6,8 +6,8 @@ %% %% %% This file's version and date are: - \def\versionno{1.16} - \def\versiondate{2021/12/23\space} + \def\versionno{1.17} + \def\versiondate{2021/12/26\space} %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -68,23 +68,51 @@ \LoadClass[twoside,9pt,twocolumn]{extarticle} \ifdefined\NewDocumentCommand\else - \RequirePackage{xparse} + \RequirePackage{xparse}[2020/02/25] \fi -\RequirePackage{etoolbox}% dropped xpatch 2020/02/28 +\RequirePackage{etoolbox} \RequirePackage{ifthen} -\RequirePackage{iftex}% check whether pdftex or another engine is used -\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}% backward compatibility (Thanks Ulrike Fischer) +%%%%%%%%%%%%% Test compatibility of older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}% backward compatibility (thanks Ulrike Fischer) + +\IfFormatAtLeastTF{2020/02/25}{% + \ClassInfo{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 or later are strongly recommended for best results} + }{% + \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. Formats dated 2020 or later are recommended for the asmejour class. Older formats may generate errors or fail entirely}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. (You can try to click past the errors for now, but your abstract will probably not compile properly.)}% +} + \DeclareDocumentCommand\LogNote{m}{% \IfFormatAtLeastTF{2021/11/15}{% - \ClassNoteNoLine{asmejour}{#1}% New with this recent format + \ClassNoteNoLine{asmejour}{#1}% New with the recent LaTeX format }{% \ClassWarningNoLine{asmejour}{#1}% } } +%% provide iftex command \ifpdftex for those still running old distributions +\IfFormatAtLeastTF{2019/11/07}{% + \RequirePackage{iftex}% check whether pdftex or another engine is used + }{% + \LogNote{The asmeconf class requires the missing package iftex---trying a work-around.} + % Code copied from iftex package written by the LaTeX3 Project (used under LPPL). + % \csname and \let construct useful for hiding \ifzzz tokens from outer level \if tests. + \def\IFTEX@let#1#2{% + \expandafter\let\csname if#1\expandafter\endcsname + \csname if#2\endcsname} + % pdftex (including in dvi mode) + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdftexversion\endcsname\relax + \IFTEX@let{pdftex}{false} + \else + \IFTEX@let{pdftex}{true} + \fi + \IFTEX@let{PDFTeX}{pdftex} +} + + %%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{kvoptions}% this package calls kvsetkeys @@ -327,7 +355,8 @@ \RequirePackage[utf8]{inputenc}% for backward compatibility with pre-2018 LaTeX distributions \else \ifaj@setpdfa\ClassWarningNoLine{asmejour}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use % - \protect\DeclareDocumentMetadata{pdfstandard=A-3b} before \protect\begin{document}}\fi% + \protec\RequirePackage{pdfmanagement-testphase} % + \protect\DeclareDocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmejour}}\fi% \ifluatex \directlua{ if pdf.getminorversion() \string~= 7 then @@ -773,6 +802,8 @@ \renewcommand{\doitext}{doi:~} % change the default, {doi:}, to this for ASME specification \RequirePackage{bookmark} % improves handling of pdf bookmarks +\providecommand*{\toclevel@subfigure}{1}% <== to address unknown bookmark level of subfigure. 2021/12/24 + \providecommand\hrefurl[2]{\href{#1}{#2}}% to address certain issues around URL recognition with new pdf management code, 2021/12/22 %% This alias is also incorporated into asmejour.bst -- cgit v1.2.3