texlive[69722] Master/texmf-dist: asmejour (6feb24)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 6 21:33:26 CET 2024
Revision: 69722
https://tug.org/svn/texlive?view=revision&revision=69722
Author: karl
Date: 2024-02-06 21:33:26 +0100 (Tue, 06 Feb 2024)
Log Message:
-----------
asmejour (6feb24)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bst/asmejour/asmejour.bst
trunk/Master/texmf-dist/doc/latex/asmejour/README.md
trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib
trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf
trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
trunk/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
trunk/Master/texmf-dist/doc/latex/asmejour/sample-figure-1.pdf
trunk/Master/texmf-dist/doc/latex/asmejour/sample-figure-2a.pdf
trunk/Master/texmf-dist/doc/latex/asmejour/sample-figure-2b.pdf
trunk/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
Modified: trunk/Master/texmf-dist/bibtex/bst/asmejour/asmejour.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/asmejour/asmejour.bst 2024-02-06 20:33:15 UTC (rev 69721)
+++ trunk/Master/texmf-dist/bibtex/bst/asmejour/asmejour.bst 2024-02-06 20:33:26 UTC (rev 69722)
@@ -4,7 +4,7 @@
%% *** This bibtex style follows ASME journals ***
%%
%%
- %% This file is asmejour.bst, version 1.07 dated 2023/05/06.
+ %% This file is asmejour.bst, version 1.08 dated 2024/02/03.
%%
%% This file was generated and edited by John Lienhard.
%% This file is a derivative work under Clause 6 of the LPPL license.
@@ -83,6 +83,9 @@
%% Modifications in v1.07 (2023/05/06)
%% correct code that provides \hrefurl
%%
+ %% Modifications in v1.08 (2024/02/03)
+ %% correct punctuation in journal macros
+ %%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
%% Massachusetts Institute of Technology
@@ -511,108 +514,108 @@
MACRO {pubmed} {"https://www.ncbi.nlm.nih.gov/pubmed/"}
-MACRO {amr} {"Appl. Mech. Rev."}
+MACRO {amr} {"Appl.\ Mech.\ Rev."}
MACRO {lds} {"ASME Letters Dynamic Systems"}
MACRO {jru} {"ASME J. Risk Uncertainty"}
-MACRO {jsbc} {"ASME J. Sustainable Bldg. and Cities"}
+MACRO {jsbc} {"ASME J. Sustainable Bldg.\ and Cities"}
-MACRO {jam} {"ASME J. Appl. Mech."}
+MACRO {jam} {"ASME J. Appl.\ Mech."}
-MACRO {jbe} {"ASME J. Biomed. Eng."}
+MACRO {jbe} {"ASME J. Biomed.\ Eng."}
-MACRO {jcnd} {"ASME J. Comput. Nonlin. Dyn."}
+MACRO {jcnd} {"ASME J. Comput.\ Nonlin.\ Dyn."}
-MACRO {jcise} {"ASME J. Comput. Inf. Sci. Eng."}
+MACRO {jcise} {"ASME J. Comput.\ Inf.\ Sci.\ Eng."}
-MACRO {jds} {"J. Dyn. Syst.-T. ASME"}
+MACRO {jds} {"J. Dyn.\ Syst.---T. ASME"}
-MACRO {jep} {"ASME J. Electron. Packag."}
+MACRO {jep} {"ASME J. Electron.\ Packag."}
MACRO {jert} {"ASME J. Energy Resour."}
-MACRO {jegtp} {"ASME J. Eng. Gas Turbines Power"}
+MACRO {jegtp} {"ASME J. Eng.\ Gas Turbines Power"}
-MACRO {jem} {"ASME J. Eng. Mater."}
+MACRO {jem} {"ASME J. Eng.\ Mater."}
MACRO {jfe} {"ASME J. Fluids Eng."}
-MACRO {jfcst} {"ASME J. Fuel Cell Sci. Tech."}
+MACRO {jfcst} {"ASME J. Fuel Cell Sci.\ Tech."}
-MACRO {jht} {"ASME J. Heat Transfer-Trans. ASME"}
+MACRO {jht} {"ASME J. Heat Transfer---Trans.\ ASME"}
MACRO {jhmt} {"ASME J. Heat Mass Transfer"}
-MACRO {jmse} {"ASME J. Manuf. Sci. E."}
+MACRO {jmse} {"ASME J. Manuf.\ Sci.\ E."}
-MACRO {jmd} {"ASME J. Mech. Des."}
+MACRO {jmd} {"ASME J. Mech.\ Des."}
-MACRO {jmr} {"ASME J. Mech. Robot."}
+MACRO {jmr} {"ASME J. Mech.\ Robot."}
-MACRO {jmdv} {"ASME J. Med. Devices"}
+MACRO {jmdv} {"ASME J. Med.\ Devices"}
MACRO {jmnm} {"ASME J. Micro Nano-Manuf."}
-MACRO {jnem} {"ASME J. Nanotech Eng. Med."}
+MACRO {jnem} {"ASME J. Nanotech Eng.\ Med."}
-MACRO {joma} {"ASME J. Offshore Mech. Arct."}
+MACRO {joma} {"ASME J. Offshore Mech.\ Arct."}
-MACRO {jpv} {"ASME J. Press. Vess."}
+MACRO {jpv} {"ASME J. Press.\ Vess."}
-MACRO {jse} {"ASME J. Sol. Energy"}
+MACRO {jse} {"ASME J. Sol.\ Energy"}
-MACRO {jtsea} {"ASME J. Therm. Sci. Eng. Appl."}
+MACRO {jtsea} {"ASME J. Therm.\ Sci.\ Eng.\ Appl."}
MACRO {jtb} {"ASME J. Tribol."}
MACRO {jtm} {"ASME J. Turbomach."}
-MACRO {jva} {"ASME J. Vib. Acoust."}
+MACRO {jva} {"ASME J. Vib.\ Acoust."}
-MACRO {acmcs} {"ACM Comput. Surv."}
+MACRO {acmcs} {"ACM Comput.\ Surv."}
MACRO {acta} {"Acta Inf."}
-MACRO {cacm} {"Commun. ACM"}
+MACRO {cacm} {"Commun.\ ACM"}
-MACRO {ibmjrd} {"IBM J. Res. Dev."}
+MACRO {ibmjrd} {"IBM J. Res.\ Dev."}
MACRO {ibmsj} {"IBM Syst.~J."}
-MACRO {ieeese} {"IEEE Trans. Software Eng."}
+MACRO {ieeese} {"IEEE Trans.\ Software Eng."}
-MACRO {ieeetc} {"IEEE Trans. Comput."}
+MACRO {ieeetc} {"IEEE Trans.\ Comput."}
MACRO {ieeetcad}
- {"IEEE Trans. Comput. Aid. Des."}
+ {"IEEE Trans. Comput.\ Aid.\ Des."}
-MACRO {ipl} {"Inf. Process. Lett."}
+MACRO {ipl} {"Inf.\ Process.\ Lett."}
MACRO {jacm} {"J.~ACM"}
-MACRO {jcss} {"J.~Comput. Syst. Sci."}
+MACRO {jcss} {"J.~Comput.\ Syst.\ Sci."}
-MACRO {scp} {"Sci. Comput. Program."}
+MACRO {scp} {"Sci.\ Comput.\ Program."}
MACRO {sicomp} {"SIAM J. Comput."}
-MACRO {tocs} {"ACM Trans. Comput. Syst."}
+MACRO {tocs} {"ACM Trans.\ Comput.\ Syst."}
-MACRO {tods} {"ACM Trans. Database Syst."}
+MACRO {tods} {"ACM Trans.\ Database Syst."}
-MACRO {tog} {"ACM Trans. Graphic."}
+MACRO {tog} {"ACM Trans.\ Graphic."}
-MACRO {toms} {"ACM Trans. Math. Software"}
+MACRO {toms} {"ACM Trans.\ Math.\ Software"}
-MACRO {toois} {"ACM Trans. Office Inf. Syst."}
+MACRO {toois} {"ACM Trans.\ Office Inf.\ Syst."}
-MACRO {toplas} {"ACM Trans. Progr. Lang. Syst."}
+MACRO {toplas} {"ACM Trans.\ Progr.\ Lang.\ Syst."}
-MACRO {tcs} {"Theor. Comput. Sci."}
+MACRO {tcs} {"Theor.\ Comput.\ Sci."}
FUNCTION {bibinfo.check}
{ swap$
Modified: trunk/Master/texmf-dist/doc/latex/asmejour/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/asmejour/README.md 2024-02-06 20:33:15 UTC (rev 69721)
+++ trunk/Master/texmf-dist/doc/latex/asmejour/README.md 2024-02-06 20:33:26 UTC (rev 69722)
@@ -1,11 +1,11 @@
#asmejour: A template for ASME journal papers#
- Version 1.21 dated 2023/10/22.
+ Version 1.22 dated 2024/02/06.
####Overview####
This class provides a template to format preprints in the style of journal papers published by the American Society of Mechanical Engineers.
- The layout and reference formats follow the style of published papers in 2022.
+ The layout and reference formats follow the style of published papers in 2023.
This work is not a publication of ASME.
@@ -21,7 +21,7 @@
sample-figure-1.pdf,
sample-figure-2a.pdf,
sample-figure-2b.pdf -- figures for the example template
- /asmewide_example -- directory includes asmewide.sty and examples of wide equations```
+ /asmewide_example -- directory includes asmewide.sty and examples of wide equations```
The .tex and .cls files are commented and should be self-explanatory.
@@ -66,6 +66,14 @@
---
####Change log####
+
+v1.22 (2024/02/06)
+ - The newtx package has dropped superiors option, so asmejour has dropped the \[superiors\] option and related code.
+ - Dropped legacy options \[lang, lang-second, lang-third\]
+ - Remove several other blocks of legacy code
+ - Refresh sample figures
+ - Edits to asmejour.bst: fix punctuation and spacing in journal title macros
+ - Edit asmejour-sample.bib
v1.21 (2023/10/22)
- Adjust loading order of hyperxmp and hyperref to accommodate v5.12 of hyperxmp package
Modified: trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib 2024-02-06 20:33:15 UTC (rev 69721)
+++ trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib 2024-02-06 20:33:26 UTC (rev 69722)
@@ -1,6 +1,6 @@
%% Sample bibliography file for asmejour.bst and asmejour.cls
%%
-%% Revised: 30 December 2022
+%% Revised: 06 February 2024
%% Copyright John H. Lienhard, MIT
%% Offered under the MIT license: https://ctan.org/license/mit
@@ -148,30 +148,31 @@
urldate = {Dec. 22, 2021},
}
- at article{Lienhard2019b,
- title = {Exterior Shape Factors from Interior Shape Factors},
- year = {2019},
- journal = jht,
- doi = {10.1115/1.4042912},
- author = {Lienhard, V, John H.},
- eid = {061301},
- volume = {141},
- number = {6},
+ at article{lienhard2020,
+ author = {Lienhard, John H.},
+ title = {Heat Transfer in Flat-Plate Boundary Layers: A Correlation for Laminar, Transitional, and Turbulent Flow},
+ journal = jht,
+ volume = {142},
+ number = {6},
+ eid = {061805},
+ year = {2020},
+ month = jun,
+ doi = {10.1115/1.4046795},
}
-%% note use of: eid in place of pages, and use of jht macro for the journal name
+%% Note eid field rather than page numbers. Will not produce "pp." before the eid number.
+%% May include numpages = {} to get "eid (numpages pages)"
+%% Note use of jht macro for title title (produces "ASME J. Heat Transfer"). All ASME journals have macros.
- at article{lienhard2023,
- author = {Lienhard, V, John H.},
- title = {Steady Two-Dimensional Conduction: Simple and Double Layer Potentials, Corner Singularities, and Induced Heat Flux},
- journal = jhmt,
- volume = {145},
- number = {3},
- eid = {031401},
- year = {2023},
- month = {3},
- doi = {10.1115/1.4055833},
- url = {https://doi.org/10.1115/1.4055833},
- eprint = {https://asmedigitalcollection.asme.org/heattransfer/article-pdf/145/3/031401/6958758/ht\_145\_03\_031401.pdf},
+ at article{lienhard2019,
+ author = {Lienhard, John H.},
+ title = {Linearization of Nongray Radiation Exchange: The Internal Fractional Function Reconsidered},
+ journal = jht,
+ volume = {141},
+ number = {5},
+ eid = {052701},
+ year = {2019},
+ month = mar,
+ doi = {10.1115/1.4042158},
}
%% note use of: eid in place of pages, and use of jhmt macro for the journal name
@@ -301,17 +302,6 @@
urldate = {January 10, 2022},
}
- at article{Lienhard2019c,
- author = {Lienhard, V, John H.},
- year = {2019},
- title = {Linearization of Nongray Radiation Exchange: The Internal Fractional Function Reconsidered},
- journal = jht,
- doi = {10.1115/1.4042158},
- volume = {141},
- number = {5},
- eid = {052701},
-}
-
@book{ww1927,
author = {E. T. Whittaker and E. N. Watson},
year = {1920},
Modified: trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex 2024-02-06 20:33:15 UTC (rev 69721)
+++ trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex 2024-02-06 20:33:26 UTC (rev 69722)
@@ -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.21 dated 2023/10/22
+%% This file is version 1.22 dated 2024/02/06
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -17,12 +17,6 @@
%%
%% * Option to omit the list of figures and list of tables at the end [nolists]
%%
-%% * Math options from M. Sharpe's newtxmath package: upright integrals [upint];
-%% * [varvw] for a v and w that are better distinguished from Greek nu; [subscriptcorrection]
-%% * to fine-tune the placement of math subscripts; and also additional options such as
-%% * [smallerops, varg, slantedGreek, frenchmath, varbb, cmbraces]. Version 1.6 or higher
-%% * is recommended.
-%%
%% * Option to include line numbers [lineno]. You must run *twice* for proper placement of the
%% * line numbers. The lineno package does not number tables, footnotes, or captions.
%% * This option will disable balancing of the column heights on final page.
@@ -51,9 +45,14 @@
%% * some other options for cal are: dutchcal, zapfc, cm (default), boondox,...
%% * frak (fraktur), bb (blackboard bold), scr (script) may also be controlled.
%%
-%% * With pdfTeX, an option to use newtxtext's superiors font for footnotes [nodefaultsups] and an option
-%% * for slightly larger small capitals [largesc].
+%% * Math options from M. Sharpe's newtxmath package: upright integrals [upint];
+%% * [varvw] for a v and w that are better distinguished from Greek nu; [subscriptcorrection]
+%% * to fine-tune the placement of math subscripts; and also additional options such as
+%% * [smallerops, varg, slantedGreek, frenchmath, varbb, cmbraces]. Version 1.6 or higher
+%% * is recommended.
%%
+%% * With pdfTeX, an option to use newtxtext's slightly larger small capitals font [largesc]
+%%
%% * Options for typewriter font
%% * [var0] replace default slashed zero by unslashed zero
%% * [mono] force interword separation to monospacing
@@ -66,14 +65,13 @@
%% For details of the newtx and mathalfa packages, refer to their documentation (available at CTAN: http://ctan.org).
%%
%% The use of commands defined or modified by the asmejour class is illustrated below. In particular, some care
-%% is needed when using complicated math and macros in section headings, to avoid problems with pdf bookmarks,
-%% as facilitated by the optional argument of \section (also illustrated below).
+%% is needed when using complicated math and macros in section headings,also illustrated below.
%%
%=========================================================
%%
%% LICENSE:
%%
-%% Copyright (c) 2023 John H. Lienhard
+%% Copyright (c) 2024 John H. Lienhard
%%
%% Offered under the MIT license: https://ctan.org/license/mit
%%
@@ -159,7 +157,6 @@
This paper is an example and {\upshape\LaTeX} template for the {\upshape\texttt{asmejour}} class. Papers typeset in this class will follow ASME journal style for margins, fonts, headings, captions, and reference formats. The class will also lay out the author, title, and abstract in ASME style. The pdf file produced will include internal and external hyperlinks, bookmarks, and pdf metadata. The class is intended to be used with the {\upshape\texttt{asmejour.bst} \hologo{BibTeX}}, which is part of this distribution. This style produces modern reference formats, following current ASME styles and including hyperlinked DOI and URL fields. Options to the class include line numbering, final column balancing, various math options, government copyright notices, and archivability (PDF/A). In addition, section headers may contain mathematics, references, citations, and footnotes. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
\end{abstract}
-
\date{Version \versionno, \today}%% You can modify this information as desired.
%% Putting \date{} will suppress any date.
%% If this command is omitted, date defaults to \today
@@ -230,8 +227,8 @@
%% captions go below figures
\begin{figure}
-\centering\includegraphics[width=0.7\linewidth]{sample-figure-1.pdf}
-\caption{A figure caption with math, Eq.~\eqref{eqn:1}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
+\centering\includegraphics[width=\linewidth]{sample-figure-1.pdf}
+\caption{Caption with math, eqn.~\eqref{eqn:1}: $\Delta T/T_m$ vs.\ $\Delta T/T_1$~\cite{lienhard2019}\label{fig:1}}
\end{figure}
%%%%%%%%%%%%% end figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -256,28 +253,24 @@
\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}%
\centering{
- \includegraphics{sample-figure-2a.pdf}
+ \includegraphics[width=0.9\linewidth,alt={Nusselt number data for isothermal wall}]{sample-figure-2a.pdf}
+ \subcaption{\label{fig:interior-region}}
}%
-\vspace*{1.7em}
-}%
-\subcaption{\label{fig:interior-region}}
\end{subfigure}%
%%%%%%%% don't leave a break here
\begin{subfigure}[t]{0.5\textwidth} % You will get same result using \begin{minipage}[t]{0.5\textwidth}
\centering{
-\includegraphics{sample-figure-2b.pdf}
-\subcaption{\label{fig:exterior-region}}
+ \includegraphics[width=0.927\linewidth,alt={Nusselt number data for constant heat flux wall}]{sample-figure-2b.pdf}
+ \subcaption{\label{fig:exterior-region}}
}\end{subfigure}%
-\caption{A figure with two subfigures: \subref{fig:interior-region} interior region, and \subref{fig:exterior-region} exterior region \cite{lienhard2023}\label{fig:2}}
+\caption{A figure with two subfigures: \subref{fig:interior-region} uniform wall temperature; and \subref{fig:exterior-region} uniform wall heat flux, unheated starting length \cite{lienhard2020}\label{fig:2}}
\end{figure*}
%%%%%%%%%%%%%%% end two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Reference Formatting with \texttt{asmejour.bst}}
The {\upshape\texttt{asmejour.bst}} \hologo{BibTeX} style follows the reference styles observed in ASME journals in 2021.\footnote{\texttt{asmejour.bst} is intended as a replacement for the older style \texttt{asmems4.bst}, which does not follow ASME's current reference formats or support DOI and URL.} The vast majority of published references are to journal papers and books. Examples for these and many other entry types are given in the \texttt{asmejour-sample.bib} file, which is part of this distribution. Citations and references are managed by the standard \texttt{natbib} package.
@@ -471,8 +464,6 @@
As of June 2022, the \LaTeX 3 team has added native support for PDF/A in the \LaTeX\ kernel, using \verb|\DocumentMetadata{..}|. This approach works with \textit{both} \hologo{pdfLaTeX} and \hologo{LuaLaTeX}. The class options previously mentioned can be omitted when using \verb|\DocumentMetadata{..}|.
-\subsection{Superiors Font} The \texttt{newtxtext} package includes a superiors font (numbers and letters) for use in footnote markers and superscripts. The option \texttt{[nodefaultsups]} enables this font, but only when running \hologo{pdfTeX}. %The corresponding author mark in the author block will not change.
-
\subsection{Typewriter Font Options} This font is the sans-serif, monospaced font \texttt{inconsolata}. By default, the word spacing is variable, but option \texttt{[mono]} ends this behavior. A slashed zero is the default; option \texttt{[var0]} removes the slash. Option \texttt{[hyphenate]} enables hyphenation of the typewriter font when running \hologo{pdfTeX}.
@@ -576,7 +567,7 @@
\appendix %%% starting appendices
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Incomplete Zeta Function~\cite{Lienhard2019c}\label{app:zetafunction}}
+\section{Incomplete Zeta Function~\cite{lienhard2019}\label{app:zetafunction}}
This text is just for illustration. The radiation fractional function may be written in terms of the incomplete zeta function for convenience:
\begin{align}
@@ -612,6 +603,7 @@
No effort has been made to support customization of language-specific fonts (some fonts can be implemented using the \texttt{substitutefont} package~\cite{milde}). The bibliography style, \texttt{asmejour.bst}, is designed in English and aimed at \texttt{BibTeX}. Multilingual bibliographies can be supported using \texttt{BibLaTeX}.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\selectlanguage{french}
\section{Discours Préliminaire de Fourier}\label{app:fourier}
@@ -626,7 +618,7 @@
%%%%%%%%%%%%% BIBLIOGRAPHY %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\nocite{*} %% <=== delete this line - unless you wish to typeset the entire contents of your .bib file.
+\nocite{*} %% <=== Delete this line - unless you wish to typeset the entire contents of your .bib file.
\bibliographystyle{asmejour} %% .bst file that follows ASME journal format. Do not change.
Modified: trunk/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/asmejour/sample-figure-1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/asmejour/sample-figure-2a.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/asmejour/sample-figure-2b.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/asmejour/asmejour.cls 2024-02-06 20:33:15 UTC (rev 69721)
+++ trunk/Master/texmf-dist/tex/latex/asmejour/asmejour.cls 2024-02-06 20:33:26 UTC (rev 69722)
@@ -6,8 +6,8 @@
%%
%%
%% This file's version and date are:
- \def\versionno{1.21}
- \def\versiondate{2023/10/22\space}
+ \def\versionno{1.22}
+ \def\versiondate{2024/01/30\space}
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -33,9 +33,6 @@
%%
%% The title block is set by specific commands that are described in the asmejour-template.tex file.
%%
-%% The \section[]{} command's optional argument has been changed to better support pdf bookmarks, and
-%% \section*[]{} is similarly modified.
-%%
%% The class defines abstract environment (with optional keywords) and a nomenclature environment.
%% (LaTeX must be run twice to align the columns in the nomenclature list).
%%
@@ -43,7 +40,7 @@
%%
%% LICENSE:
%%
-%% Copyright (c) 2023 John H. Lienhard
+%% Copyright (c) 2024 John H. Lienhard
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
%% associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -71,7 +68,7 @@
\RequirePackage{xparse}[2020/02/25]
\fi
-\RequirePackage{iftex}[2019/11/07]% provides \ifpdftex, etc.
+\RequirePackage{iftex}% provides \ifpdftex, etc.
\RequirePackage{ifthen}
%%%%%%%%%%%%% Test compatibility of older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -126,9 +123,6 @@
\PassOptionsToPackage{#1}{mathalfa}%
}
-%% set key [nodefaultsups] to obtain the newtx superiors font for footnotes.
-\DeclareBoolOption{nodefaultsups}
-
%% Option to obtain line numbers [lineno]
\DeclareBoolOption{lineno}
@@ -161,23 +155,6 @@
}%
}
-%% only main= is actually needed, but keeping these three legacy commands for backward compatibility (these will disappear in 2024 or so)
-\define at key{asmejour}{lang}[english]{% deprecated option
- \PassOptionsToPackage{main=#1,#1}{babel}%
- \PassOptionsToPackage{pdflang=en}{hyperref}
- \aj at mainsettrue%
- \ifthenelse{\equal{#1}{english}}{%
- \relax}{%
- \LogNote{Selecting #1 as the primary language}%
- }%
-}
-\define at key{asmejour}{lang-second}[english]{% deprecated option
- \PassOptionsToPackage{#1}{babel}%
-}
-\define at key{asmejour}{lang-third}[english]{% deprecated option
- \PassOptionsToPackage{#1}{babel}%
-}
-
%% if main language was not chosen explicitly, default to English
\ifaj at mainset\relax\else
\PassOptionsToPackage{main=english}{babel}%
@@ -200,7 +177,7 @@
\NewDocumentCommand\@DisableKeys{>{\SplitList{;}}m}{\ProcessList{#1}{\aj at DisableOption}}
\def\@KeyFamily{asmejour}
-\@DisableKeys{nodefaultsups;mathalfa;barcolor;lineno;balance;nolists;govt;govtsome;contractor;main;lang;lang-second;lang-third}
+\@DisableKeys{mathalfa;barcolor;lineno;balance;nolists;govt;govtsome;contractor;main}
%%%%%%% PDF/A Compliance Keys %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -218,7 +195,7 @@
setkeys=\kvsetkeys,
}
- \ifpdftex %% pdf/a compliance has only been configured for pdflatex. Revised 2023/10/20
+ \ifpdftex %% configure pdf/a compliance for pdflatex. Revised 2023/10/20
%
%%% set key [pdfa] to activate pdf/a compliance (default is pdf/A-3u)
\define at key{pdfaopt}{pdf-a}[true]{%
@@ -250,8 +227,33 @@
%% Done with these keys, so we can now disable them
\def\@KeyFamily{pdfaopt}
\@DisableKeys{pdf-a;pdfapart;pdfaconformance}
+
+ %% new pdf management in LaTeX, using \DocumentMetaData{..}, is preferred to this approach.
+ \ifpdftex
+ \ifaj at pdfaone
+ \pdfminorversion=4 % for pdf/a-1 need version 4, not 7
+ \else
+ \pdfminorversion=7 % this selection is not required
+ \fi
+ \else
+ \ifaj at setpdfa\ClassWarningNoLine{asmejour}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use %
+ \protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmeconf}}\fi%
+ \ifx\directlua\undefined\else
+ \directlua{
+ if pdf.getminorversion() \string~= 7 then
+ if (status.pdf_gone and status.pdf_gone > 0)
+ or (status.pdf_ptr and status.pdf_ptr > 0) then
+ tex.error("PDF version cannot be changed anymore")
+ else
+ pdf.setminorversion(7)
+ end
+ end
+ \fi
+ }% will lose some accented characters this way... better to use fontspec, if the system fonts exist.
+ \fi
\fi
+
%%%%%%%%%% Further class options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Option to omit ASME footer
@@ -286,19 +288,6 @@
\PassOptionsToPackage{lining}{newtxtext}%
}
-%% Option not to use latex default superscripts, instead using the newtxtext superiors font [nodefaultsups]
-%% This naming is inverse to the newtxtext package, which uses the superior font by default!
-\ifasmejour at nodefaultsups
- \ifpdftex
- \else
- \ClassWarningNoLine{asmejour}{The [nodefaultsups] option is only supported with pdftex. It will be ignored}%
- \fi
-\else
- \ifpdftex
- \PassOptionsToPackage{defaultsups}{newtxtext}
- \fi
-\fi
-
%% Option to hyphenate the typewriter font [hyphenate]
\DeclareOption{hyphenate}{%
\PassOptionsToPackage{hyphenate}{inconsolata}%
@@ -385,34 +374,7 @@
\renewcommand*{\midrule}{\specialrule{0.5pt}{2pt}{3pt}}
\renewcommand*{\bottomrule}{\specialrule{0.5pt}{1pt}{\doublerulesep}\specialrule{0.5pt}{0pt}{0pt}}
-%%%%%%%%%%%%% PDF/A related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% new pdf management in LaTeX, using \DocumentMetaData{..}, is preferred to this approach.
-\ifpdftex
- \ifaj at pdfaone
- \pdfminorversion=4 % for pdf/a-1 need version 4, not 7
- \else
- \pdfminorversion=7 % this selection is not required
- \fi
- \RequirePackage[T1]{fontenc}
- \RequirePackage[utf8]{inputenc}% for backward compatibility with pre-2018 LaTeX distributions
-\else
- \ifaj at setpdfa\ClassWarningNoLine{asmejour}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use %
- \protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmeconf}}\fi%
- \ifx\directlua\undefined\else
- \directlua{
- if pdf.getminorversion() \string~= 7 then
- if (status.pdf_gone and status.pdf_gone > 0)
- or (status.pdf_ptr and status.pdf_ptr > 0) then
- tex.error("PDF version cannot be changed anymore")
- else
- pdf.setminorversion(7)
- end
- end
- \fi
- }% will lose some accented characters this way... better to use fontspec, if the system fonts exist.
-\fi
-
%%%%%%%%%%%%% Font related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{mathtools}% loads and extends amsmath
@@ -419,6 +381,8 @@
\RequirePackage[]{babel}
\ifpdftex
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage[utf8]{inputenc}% for backward compatibility with pre-2018 LaTeX distributions
\RequirePackage[helvratio=0.91]{newtxtext}% add this scaling 2022/06/26
\RequirePackage[varl,varqu]{inconsolata}% sans typewriter font; restored varl, varqu 2020/08/10
\RequirePackage[]{newtxmath}
@@ -474,16 +438,6 @@
RawFeature = {+ss01,\ssztwo,+ss03},
]
\fi
-
-%% override \textsu if using default superiors (allow for undefined \textsu in fontspec). Revised 2023/10/21
-\providecommand\NewCommandCopy{\let} % for pre-2020/10 LaTeX distributions
-\providecommand\RenewCommandCopy{\let}
-
-\ifx\textsu\undefined\NewCommandCopy\textsu\textsuperscript\fi
-\ifasmejour at nodefaultsups\else
- \RenewCommandCopy\textsu\textsuperscript
-\fi
-%%
\RequirePackage[]{mathalfa}% load optional fonts for Calligraphy, Script, etc.
@@ -649,22 +603,26 @@
\ifasmejour at balance
\ClassWarningNoLine{asmejour}{Package lineno loaded, so final column balancing will be disabled}%
\fi
- %%% Allow line numbering in AMS math environments.
- %%% postdisplaypenalty adjusted to avoid extra line number at end, see discussion here: https://tex.stackexchange.com/a/461192/
- %%% multline has some problem that puts an extra line number above it.
- %%% Requires xparse and etoolbox
- \NewDocumentCommand{\aj at losepostpenalty}{}{\patchcmd{\linenomathWithnumbers}{\advance\postdisplaypenalty\linenopenalty}{}{}{}}%
-%
- \NewDocumentCommand{\aj at FixAMSMath}{m}{%
- \AtBeginEnvironment{#1}{\aj at losepostpenalty\linenomath}%
- \AtEndEnvironment{#1}{\endlinenomath}%
- \AtBeginEnvironment{#1*}{\aj at losepostpenalty\linenomath}%
- \AtEndEnvironment{#1*}{\endlinenomath}%
- }%
+ %%% Patch to allow line numbering in AMS math environments.
+ %%% This patch is for lineno versions earlier than v5.2 [2023/05/19]. As of mid-2023, the lineno package
+ %%% has been corrected to account for the AMS math environments. Retaining temporarily for backward compatibility.
+ %%% postdisplaypenalty adjusted to avoid extra line number at end, see: https://tex.stackexchange.com/a/461192/
+ %%% multline has some additional problem that puts an extra line number above it.
+ \IfPackageAtLeastTF{lineno}{2023/05/19}{\relax}{
+ \NewDocumentCommand{\ac at losepostpenalty}{}{\patchcmd{\linenomathWithnumbers}{\advance\postdisplaypenalty\linenopenalty}{}{}{}}
+ %
+ \NewDocumentCommand{\ac at FixAMSMath}{m}{%
+ \AtBeginEnvironment{#1}{\ac at losepostpenalty\linenomath}%
+ \AtEndEnvironment{#1}{\endlinenomath}%
+ \AtBeginEnvironment{#1*}{\ac at losepostpenalty\linenomath}%
+ \AtEndEnvironment{#1*}{\endlinenomath}%
+ }
+ %
+ \NewDocumentCommand{\ac at FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\ac at FixAMSMath}}
+ %
+ \ac at FixAll{align;alignat;gather;flalign;multline}
+ }
%
- \NewDocumentCommand{\aj at FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\aj at FixAMSMath}}%
- \aj at FixAll{align;alignat;gather;flalign;multline}%
-%
\else
\ProvideDocumentEnvironment{linenomath}{}{}{}%
\ifasmejour at balance % balancing through flushend can produce weird errors
@@ -871,7 +829,6 @@
\RequirePackage[psdextra]{hyperref} % recent kernel transition suggests providing most hyperref options via \hypersetup,
% but setting psdextra here (for additional math support in bookmarks) 2021/12/23
\hypersetup{%
- unicode, % Unicode encoded PDF strings, default as of hyperref v7.0
pdfborder={0 0 0},%
bookmarksnumbered=true,%
bookmarksopen=true,%
@@ -948,26 +905,7 @@
\def\footnote#1{}%
}
-%%% Create an optional argument for unnumbered sections and set pdf bookmark (thru \addcontentsline).
-%%% The optional argument will manually set the pdf bookmark for that section; can be used to avoid hyperref
-%%% errors when macros are in section titles.
-%%% There should not be errors for $$, \cite, \ref, \label, \footnote, or \bm with current construction.
-\let\svsection\section
-\RenewDocumentCommand{\section}{s o m}{%
- \IfBooleanTF {#1}
- {\svsection*{#3}\phantomsection%
- {\IfNoValueTF {#2}
- {\addcontentsline{toc}{section}{#3}}
- {\addcontentsline{toc}{section}{#2}}% remove trailing space 2020/02/28
- }%
- }
- {\IfNoValueTF {#2}
- {\svsection{#3}}
- {\svsection[#2]{#3}}%
- }%
-}
-
%%%%%%%%%%%%% Define some section and other names for special environments %%%%%%%
\providecommand{\nomname}{Nomenclature}
@@ -1047,20 +985,8 @@
]%
}%
\fi
-%\ifaj at lists
-% \AtEndDocument{%
-% \clearpage
-% \twocolumn[%
-% \begin{@twocolumnfalse}
-% \listoffigures
-% \listoftables
-% \end{@twocolumnfalse}
-% ]%
-% }%
-%\else
-% \LogNote{Omitting lists of figures and tables}%
-%\fi
+
%%%%%%%%%%%%%%%% Author/Title/Abstract block %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{xcoffins}
@@ -1152,13 +1078,9 @@
%% Flag for corresponding author (only one expected, although this code supports more than one)
\newif\ifaj at CA\aj at CAfalse
-\newcommand{\CAemail}[1]{\gdef\@CAemail{#1}}% legacy code, drop eventually
-
%% ASME prefers email to be in address block, not CA footnote; removed option 2021/01/30
\NewDocumentCommand{\CorrespondingAuthor}{}{%
\global\aj at CAtrue%
- \gdef\@CAsep{\relax}% legacy code, drop eventually
- \gdef\@CAemail{\relax}% legacy code, drop eventually
\def\@makefnmark{\hbox{\@textsuperscript{\sffamily\@thefnmark}}}%
\footnotemark%
\addtocounter{footnote}{-1}% in case of more than one CA
@@ -1180,9 +1102,9 @@
]
\ifaj at CA
\addtocounter{footnote}{1}
- \footnotetext{\CAwords\@CAsep \@CAemail}% includes legacy code, will remove \@CA commands eventually
+ \footnotetext{\CAwords}
\fi
- \ifaj at Date\revfootnote{\@Date}\else\relax\fi
+ \DateFootnote
\ifasmejour at contractor\revfootnote{The United States Government retains, and by accepting the article for publication, the publisher acknowledges that the United States Government retains, a non-exclusive, paid-up, irrevocable, worldwide license to publish or reproduce the published form of this work, or allow others to do so, for United States Government purposes.}%
\fi
\ifasmejour at govt\revfootnote{This material is declared a work of the U.S. Government and is not subject to copyright protection in the United States. Approved for public release; distribution is unlimited.}%
@@ -1202,14 +1124,21 @@
%% Thanks to DPC for the suggestion of \gdef\tmp{...
%% Put date as an unnumbered footnote at bottom of first column
-\newif\ifaj at Date\aj at Datetrue% If true, print a date.
-
\ExplSyntaxOn
-\RenewDocumentCommand{\date}{m}
- {%
- \tl_if_empty:nTF {#1}{\global\aj at Datefalse}{\gdef\@Date{#1}}%
- }
-\providecommand\@Date{\today}
+ \bool_new:N \g__asmejour_date_bool
+ \tl_new:N \g__asmejour_date_tl
+ \tl_new:N \DateFootnote
+ \bool_gset_true:N \g__asmejour_date_bool
+ \tl_gset:Nn \g__asmejour_date_tl { \today }
+ \tl_gset:Nn \DateFootnote {
+ \if_bool:N \g__asmejour_date_bool \revfootnote{\g__asmejour_date_tl} \else: \fi:
+ }
+ \RenewDocumentCommand{\date}{m}
+ {
+ \tl_if_empty:nTF {#1}
+ { \bool_gset_false:N \g__asmejour_date_bool }
+ { \tl_gset:Nn \g__asmejour_date_tl { #1 } }
+ }
\ExplSyntaxOff
\RenewDocumentCommand{\thanks}{m}{\relax}%% disabling this standard command, as it is inconsistent with this format
More information about the tex-live-commits
mailing list.