texlive[57598] Master/texmf-dist: asmejour (2feb21)

commits+karl at tug.org commits+karl at tug.org
Tue Feb 2 23:14:35 CET 2021


Revision: 57598
          http://tug.org/svn/texlive?view=revision&revision=57598
Author:   karl
Date:     2021-02-02 23:14:35 +0100 (Tue, 02 Feb 2021)
Log Message:
-----------
asmejour (2feb21)

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/tex/latex/asmejour/asmejour.cls

Modified: trunk/Master/texmf-dist/bibtex/bst/asmejour/asmejour.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/asmejour/asmejour.bst	2021-02-02 22:14:17 UTC (rev 57597)
+++ trunk/Master/texmf-dist/bibtex/bst/asmejour/asmejour.bst	2021-02-02 22:14:35 UTC (rev 57598)
@@ -4,7 +4,7 @@
  %% *** This bibtex style follows ASME journals ***
  %%
  %%
- %% This file is asmejour.bst, version 1.04 dated 2020/04/15.
+ %% This file is asmejour.bst, fourth 1.04 dated 2020/04/15.
  %%
  %% This file was generated and edited by John Lienhard.
  %% This file is a derivative work under Clause 6 of the LPPL license.
@@ -13,7 +13,7 @@
  %% published journal papers in early 2020. Details of the modifications follow.
  %%
  %% Created entry:   @online{...} for web publications (and aliased it to @www and @electronic)
- %% Created fields:  eventdate, urldate, urltype, venue, version, versiontype 
+ %% Created fields:  eventdate, urldate, urltype, venue, fourth, fourthtype 
  %% Format for url:  urlprefix = {}, format.web.urldate, bbl.urldate; urltype = {} changes "accessed" to other text. 
  %% Added fields:    venue and eventdate to @inproceedings
  %% Added field:     version={}, format.version to @book, @online, @manual; versiontype = {} changes "Version" to other

Modified: trunk/Master/texmf-dist/doc/latex/asmejour/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/asmejour/README.md	2021-02-02 22:14:17 UTC (rev 57597)
+++ trunk/Master/texmf-dist/doc/latex/asmejour/README.md	2021-02-02 22:14:35 UTC (rev 57598)
@@ -1,13 +1,13 @@
  
   #asmejour: A template for ASME journal papers#
  
-  Version 1.14 dated 2020/08/12.
+  Version 1.15 dated 2021/02/01.
 
   ####Overview####
-  This class provides a template to format preprints submitted to ASME journals. The layout and reference
-  formats follow the style that is being used for published papers in 2020.
+  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 2020.
   
-  This work is not a publication of ASME itself.
+  This work is not a publication of ASME.
 
   Files in this distribution are:
 
@@ -27,23 +27,29 @@
   
   This template was designed to approach the following aims:
 
-- closely approximate ASME's fonts and layout, including author/title/abstract design
+ - closely approximate ASME's fonts and layout, including author/title/abstract design
 
-- follow today's ASME style for reference lists
+ - match ASME's current reference formats, including hyperlinked DOI and URL fields
 
-- support hyperref package (hyperlinks for figures, tables, citations, and web)
+ - support hyperlinks to figures, tables, equations, references, and external URLs
 
-- support pdf bookmarks and metadata
+ - support pdf bookmarks and metadata
 
-- use the features of the newtxtext and newtxmath font packages
+ - provide line numbers for editing and review
 
-- support bold-face math, citations, and footnotes in section headings 
+ - support balancing of columns on last page
 
-- provide automatic layout of author blocks for multiple addresses
+ - support PDF/A (archival) standards if desired
 
-- support PDF/A (archival) standards if desired
+ - support copyright notices for federal employees and contractors
 
+ - support bold-face math and citations in section headings and captions
 
+ - enable various math and text features with newtxmath, newtxtext, and inconsolata packages
+
+ - enable passages in other languages, e.g., for a translation of the abstract or a quotation
+
+
   ####Author####
   
   John H. Lienhard V
@@ -58,6 +64,19 @@
  ---
  
  ####Change log####
+
+v1.15 (2021/02/01): 
+ - fix issue with math accents in mathversion sansbold (for captions)
+ - add optional copyright notices for government employees and contractors
+ - add \\EntryHeading command for nomenclature
+ - provide additional options for typewriter font
+ - simplify language options for babel
+ - make subfigure example consistent with ASME's labeling
+ - make abstract environment tolerant of blank lines
+ - edit sample bib file; include example of @manual
+ - update some usage of xparse; internal changes to \\PaperYear, \\CorrespondingAuthor and \\keywords commands.
+ - edit code for keys and options; correct largesc option; slightly increase interword shrink; remove legacy code; 
+ - substantially edit documentation
  
 v1.14 (2020/08/12): Set pdf page layout to a single page, rather than a two-page spread.
 
@@ -95,7 +114,7 @@
  
  ####License####
 
- Copyright (c) 2020 John H. Lienhard
+ Copyright (c) 2021 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, 

Modified: trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib	2021-02-02 22:14:17 UTC (rev 57597)
+++ trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib	2021-02-02 22:14:35 UTC (rev 57598)
@@ -1,6 +1,11 @@
-%% Revised: 12 April 2020
+%% Sample bibliography file for asmejour.bst and asmejour.cls
 %%
-%% Titles should be capitalized (title case) according to ASME style
+%% Revised: 30 January 2021
+%% Copyright John H. Lienhard, MIT
+%% Offered under the MIT license: https://ctan.org/license/mit 
+
+
+%% Titles should be in title case (first letters capitalized) according to ASME style
 %% Allowable fields are listed after the first use of each entry type.
 %%
 @article{DKE1969,
@@ -14,7 +19,10 @@
   doi     = {10.1115/1.3580108},
   month   = feb,
 }
-%% article supports these fields: author, year, title, journal, volume, number, pages OR eid, doi OR url OR eprint with archive, note. (The month field is not used in ASME style and will be ignored.)
+%% article supports these fields: 	author, year, title, journal, 
+%%									volume, number, pages OR eid, 
+%%									doi OR url OR eprint with archive, note. 
+%% (The month field is not used in ASME style and will be ignored.)
 	
 @article{toohey2007,
   author  = {Kathleen S. Toohey and Nancy R. Sottos and Jennifer A. Lewis and Jeffrey S. Moore and Scott R. White}, 
@@ -34,7 +42,10 @@
   publisher = {John Wiley and Sons},
   address 	= {New York, NY},
 }
-%% book supports these fields: author OR editor, year, title, edition, version, series, volume OR number, publisher, address, doi OR url OR eprint with archive, note.  type={} field can change "Chap." to something else.
+%% book supports these fields:  author OR editor, year, title, edition, version, 
+%%								series, volume OR number, publisher, address, type,
+%%								doi OR url OR eprint with archive, note.  
+%% type={} field can change "Chap." to something else.
 
 @incollection{stevens1999,
   author 	= {Thomas T. Stevens},
@@ -46,7 +57,10 @@
   address 	= {Dordrecht, Germany},
   pages 	= {22--36},
 }
-%% incollection supports these fields: author, year, title, booktitle, edition, editor, series, volume OR number, publisher, address, chapter, pages, doi OR url OR eprint with archive, note.  type={} field changes "Chap." to something else.
+%% incollection supports these fields:  author, year, title, booktitle, edition, editor, 
+%%										series, volume OR number, publisher, address, type,
+%%										chapter, pages, doi OR url OR eprint with archive, note.  
+%% type={} field changes "Chap." to something else.
 
 @inproceedings{wions2006,
   author 	= {Thomas Wions and Christopher D. Mills}, 
@@ -60,13 +74,12 @@
   pages 	= {777--798},
 }
 %% inproceedings supports these fields: author, year, title, booktitle, edition, editor, series, volume, 
-%%                                      organization OR publisher, address OR venue, eventdate, [paper] number
-%%										pages, doi, note, url, eprint with archive, url. 
+%%                                      organization OR publisher, address OR venue, eventdate, [paper] number,
+%%										pages, doi, note, url, eprint with archive, url, type.
 %% type = { } changes default "Paper No." 
 %% venue and eventdate are specific to the asmejour.bst style. The "series" field is rarely used.
 %% If there are no pages as such, just omit the pages field and ignore the bibtex warning "missing pages".
 
-
 @techreport{oligaria2011,
   author 	= {Oligaria, T. T. and Fredy, C. W. and Popullo, A. Z. and Tucker, M. A.}, 
   year 		= {2011}, 
@@ -79,7 +92,6 @@
 %% ASME's online examples omit institution; however, the ASME journals will include it, e.g.:
 %%   		institution = {Society of Automotive Engineers},
 
-
 @phdthesis{mollen2014,
   author 	= {T. P. Mollen},
   year 		= {2014},
@@ -89,7 +101,7 @@
   address 	= {Boston, MA},
 }
 %% phdthesis supports these fields: author, year, title, type, school, address, note.
-%% These fields are also supported, but don't use them all: doi, eprint with archive, url, urldate, urltype
+%% Additional fields are also supported, but don't use them all: doi, eprint with archive, url, urldate, urltype
 %% type = {} can optionally be added to change the style of thesis. Default is "Ph.D. thesis"
 
 @book{smith2014,
@@ -168,31 +180,36 @@
   urldate 	= {Nov. 6, 2019},
 }                           
 
- at online{GSL,
-  title  	= {{GNU} Scientific Library},
-  year 		= 2017,
-  URL    	= {https://www.gnu.org/software/gsl/},
+ at manual{GSL,
+  title		= {{GNU} Scientific Library},
   author 	= {Mark Galassi 
-  				and Jim Davies
-  				and James Theiler
-  				and Brian Gough
-  				and Gerard Jungman
-  				and Patrick Alken
-  				and Michael Booth
-  				and Fabrice Rossi
-  				and Rhys Ulerich},
+	and Jim Davies
+	and James Theiler
+	and Brian Gough
+	and Gerard Jungman
+	and Patrick Alken
+	and Michael Booth
+	and Fabrice Rossi
+	and Rhys Ulerich},
+	version = {2.4},
+	versiontype = {Release},
   organization = {Free Software Foundation},
   address 	= {Boston, MA},
+  year 		= 2017,
+  url 		= {https://www.gnu.org/software/gsl/},
   urldate 	= {Dec. 12, 2018},
-  version 	= {2.4},
-  versiontype = {Release},
 }
-%% An alternative approach that doesn't use version and versiontype follows next: 
+%% manual supports these fields: 	author, year, title, edition, organization, address, 
+%%									doi, eprint with archive, urldate, url, version, versiontype, note.
+%% You can change "Accessed" with "urltype", e.g., urltype = {retrieved},
+%% You can change "Version" with "versiontype, e.g., versiontype = {Release},
+
+%% Next is an alternative approach to stating the version/release that doesn't use version and versiontype: 
 @online{dlmf,
   title 	= {{NIST} {D}igital Library of Mathematical Functions, Release 1.0.17},
   year 		= {2017},
   editor 	= {F. W. J. Olver and A. B. {Olde Daalhuis} and D. W. Lozier and B. I. Schneider and
-            R. F. Boisvert and C. W. Clark and B. R. Miller and B. V. Saunders},
+            	R. F. Boisvert and C. W. Clark and B. R. Miller and B. V. Saunders},
   organization = {National Institute of Standards and Technology},
   address 	= {Gaithersburg, MD},
   url 		= {http://dlmf.nist.gov/},
@@ -200,13 +217,13 @@
 }
 
 @online{texshop,
-    author	= {Richard Koch},
-	title 	= {{\TeX}{S}hop, Version 4.01},
-	year	= {2018},
-	url 	= {http://pages.uoregon.edu/koch/texshop/obtaining.html},
-	urldate = {Apr. 16, 2018},
-    organization = {University of Oregon},
-    address = {Eugene, OR},
+  author	= {Richard Koch},
+  title 	= {{\TeX}{S}hop, Version 4.01},
+  year		= {2018},
+  url 		= {http://pages.uoregon.edu/koch/texshop/obtaining.html},
+  urldate 	= {Apr. 16, 2018},
+  organization = {University of Oregon},
+  address 	= {Eugene, OR},
 }
 
 @online{tolusis,
@@ -292,6 +309,16 @@
 }
 % note={English translation by I.\ Bruce available here at \url{http://www.17centurymaths.com/contents/introductiontoanalysisvol1.htm}},
 
+ at online{milde,
+  author 	= {G\"{u}nter Milde},
+  title 	= {{\texttt{substitutefont}}---Easy font substitution},
+  version	= {0.1.4},
+  organization = {Comprehensive \TeX\ Archive Network},
+  year 		= {2013},
+  url 		= {https://www.ctan.org/pkg/substitutefont},
+  urldate 	= {Dec. 9, 2020},
+}
+
 @book{fourier1822,
   author  	= {Jean Baptiste Joseph Fourier},
   year		= {1822},
@@ -313,9 +340,6 @@
   archive 	= hndl,
   eprint 	= {2060/19980228020},
 }
-%% techreport supports these fields: author, year, title, institution, address, number, type, 
-%%                                   note, doi OR url OR eprint with archive.
-%% ASME's online examples omit the institution and address; however, the ASME journals will include these.
 %% Equivalent links for this case: url = {https://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19980228020.pdf},
 %%                                 url = {http://hdl.handle.net/2060/19980228020}
 
@@ -324,7 +348,7 @@
   year 		= {1956},
   title 	= {The Turbulent Boundary Layer},
   booktitle = {Advances in Applied Mechanics},
-  editor 	= {H.L. Dryden and Th. von K\'arm\'an},
+  editor 	= {H. L. Dryden and Th. von K\'arm\'an},
   volume 	= {4},
   publisher = {Elsevier},
   address	= {Amsterdam, The Netherlands},
@@ -332,9 +356,9 @@
   doi 		= {10.1016/S0065-2156(08)70370-3},
 }
 %% This common case is an article in series of edited books where the series title is the same for all volumes.
-%%	  type = {..},   changes chapter to something else...
+%%	  type = {..},   changes chapter to something else
 %%    url  = {..},   can be added if it exists
-%%    edition = {..} can be added if relevant.
+%%    edition = {..} can be added if relevant
 
 @inserialcollection{DKE70,
   author	= {Donald K. Edwards},
@@ -453,6 +477,7 @@
 %% mastersthesis supports these fields: author, year, title, type, school, address, note.
 %% These fields are also supported, but don't use them all: doi, eprint with archive, url, urldate, urltype
 %% type={} can optionally be used to change the type of thesis. Default is "Master's thesis"
+
 %% The following example uses type to make an entry for a Bachelor's thesis.
 @mastersthesis{smith1996,
   author 	= {Robert Smith},
@@ -516,4 +541,8 @@
   address 	= {Boston},
   note 		= {{``The Locust Years''}},
 }
-%% inbook supports these fields: author OR editor, year, title, edition, version, versiontype, series, volume OR number, doi OR url OR eprint with archive, publisher, address, note.  type={} field can change "Chap." to something else.
+%% inbook supports these fields:    author OR editor, year, title, edition, 
+%%									version, versiontype, series, volume OR number, 
+%%									doi OR url OR eprint with archive, publisher, address, note.  
+%% type={} field can change "Chap." to something else.
+

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	2021-02-02 22:14:17 UTC (rev 57597)
+++ trunk/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex	2021-02-02 22:14:35 UTC (rev 57598)
@@ -1,9 +1,9 @@
 % !TEX encoding = UTF-8 Unicode
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% 
-%%  This file is asmejour-template.tex, a template to format papers in the style of ASME journal papers 
-%%  as they are being published in 2020.
+%%  This file is asmejour-template.tex, a template to format papers in the style of ASME journal papers. 
 %%
-%%  This file is version 1.14 dated 2020/08/12
+%%  This file is version 1.15 dated 2021/02/01
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -10,16 +10,17 @@
 %%          Massachusetts Institute of Technology
 %%          Cambridge, MA 02139-4307 USA
 %%
-%%  Class options are set up in the asmejour.cls file. These include:
+%%  Class options include:
 %%
 %%          * Option to color the vertical bar in the title block [barcolor = colorname] 
 %%          *    where colorname is any name def'd by xcolor package; omit barcolor option to get black
 %%
-%%          * Option to omit the list of figures and list of tables [nolists]
+%%          * 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]; and
-%%          *    varvw for a v and w that are better distinguished from greek nu; and also 
-%%          *    smallerops, varg, slantedGreek, frenchmath, varbb, cmbraces. Version 1.5 or higher
+%%          * 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]. The lineno package does not number tables, 
@@ -30,61 +31,53 @@
 %%			*    misbehaves, so use it with an awareness that it can create unexpected problems.
 %%			*	 This option is not compatible with line numbering.
 %%
+%%			* Options for PDF/A compliance. [pdf-a] will produce PDF/A-3u compliance with sRGB OutputIntent.
+%%			*	 [pdfapart= 1 or 2 or 3] and [pdfaconformance= b or u] allow other levels: 1b, 2b, 2u, and 3b.
+%%
+%%          * An option to omit all the ASME text fields from the footer [nofoot].
+%%
+%%          * Options for copyright notices:
+%%			* 	 Omit the ASME copyright from the footer [nocopyright]
+%%			*	 Copyright footnote if all authors are government employees  [govt]
+%%			*	 Copyright footnote if some authors are government employees [govtsome]
+%%			*	 Copyright footnote for government contractors [contractor]
+%%
 %%          * Many options for calligraphic, script, and fraktur fonts from the mathalfa package; the
 %%          *    example value used is: mathalfa=cal=euler (use Euler font for \mathcal)
 %%          *    some other options for cal are: dutchcal, zapfc, cm (default), boondox,...
 %%          *    frak (fraktur), bb (blackboard bold), scr (script) may also be controlled.
 %%
-%%          * An option to omit all the ASME text fields from the footer [nofoot].
-%%
-%%          * An option to omit only the ASME copyright field from the footer [nocopyright].
-%%
 %%          * An option to use newtxtext's superiors font for footnotes [nodefaultsups] and an option
-%%          *    for slightly larger small capitals, largesc
+%%          *    for slightly larger small capitals [largesc]
 %%
-%%          * Options to set (for the babel package) a primary language [lang= ], and secondary or tertiary
-%%          *    languages, [lang-second] and [lang-third].  If no option is given, english is the main language.
-%%			*	 If a secondary or tertiary language is selected, a primary language must also be specified.
+%%          * Options for typewriter font 
+%%          *    [hyphenate] allow hyphenation (normally suppressed because for typewriter font is often used for code)
+%%			*	 [var0] replace default slashed zero by unslashed zero
+%%			*	 [mono] force interword separation to monospacing
 %%
-%%          * Option to allow hyphenation of the typewriter font [hyphenate]
-%%          *    Hyphenation is normally suppressed for typewriter mode because it is often used for code.
+%%          * Options for the babel package to support passages in other languages (such as a translated 
+%%          *    abstract in an appendix), e.g. [french].  The main language will default to English 
+%%          *    unless a different main language is selected, e.g. [main=spanish]. See Appendix C for details.
 %%
-%%			* Options for PDF/A compliance. [pdf-a] will produce PDF/A-3u compliance with sRGB OutputIntent.
-%%			*	 [pdfapart= 1 or 2 or 3] and [pdfaconformance= b or u] allow other levels: 1b, 2b, 2u, and 3b.
+%%  For details of the newtxmath and mathalfa packages, refer to their documentation (available at CTAN: http://ctan.org).
 %%
-%%  For details of newtxmath and mathalfa, refer to their documentation (available on 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).
 %%
-%%  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, which is facilitated by the optional argument of \section, 
-%%  as also illustrated below.
-%%
  %=========================================================
 %% 
-%% LICENSE:
+%% LICENSE: 
 %%
-%% Copyright (c) 2020 John Lienhard
+%% Copyright (c) 2021 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, 
-%% including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-%% and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, 
-%% subject to the following conditions:
+%% Offered under the MIT license: https://ctan.org/license/mit 
 %%
-%% The above copyright notice and this permission notice shall be included in all copies or 
-%% substantial portions of the Software.
-%%
-%% The software is provided "as is", without warranty of any kind, express or implied, including but 
-%% not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. 
-%% In no event shall the authors or copyright holders be liable for any claim, damages or other liability, 
-%% whether in an action of contract, tort or otherwise, arising from, out of or in connection with the 
-%% software or the use or other dealings in the software.
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 %% Class options are described above.
-\documentclass[largesc,upint,varvw,mathalfa=cal=euler,barcolor=Goldenrod3,nocopyright,hyphenate,balance,lang-second=french,lang=english,pdf-a]{asmejour}
+\documentclass[subscriptcorrection,upint,varvw,mathalfa=cal=euler,barcolor=Goldenrod3,balance,hyphenate,french,pdf-a]{asmejour}
 
 %%%%%  FIELDS TO BE COMPLETED FOLLOW  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -97,12 +90,11 @@
 
 %%%% Journal name and optional copyright year %%%%%%%%%%%%%%
 
-%% Omit "Journal of"
-%% If Journal Name is quite long, use \\ to insert a line break
-\JourName{Heat Transfer} %<=== change to name of your journal
+%% Omit "Journal of". If Journal Name is quite long, use \\ to insert a line break
+\JourName{Heat Transfer}%<=== change to the name of your journal
 
-\PaperYear % defaults to current year if no argument given or if command is omitted; 
-           % \PaperYear{} omits year; \PaperYear{2018} sets 2018.
+%% The default copyright year is the current year
+%% \PaperYear{2020} sets 2020; and \PaperYear{} omits the year entirely.
                    
 %%%%%%%%%  End of Preamble  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -126,6 +118,7 @@
 %      "Name\CorrespondingAuthor{write at to.him, write at to.her}"
 
 \SetAuthorBlock{John H.\ Lienhard V\CorrespondingAuthor}{%
+Fellow ASME\\
 Rohsenow Kendall Heat Transfer Laboratory, \\
 Department of Mechanical Engineering,\\
 Massachusetts Institute of Technology, \\
@@ -139,17 +132,17 @@
 
 %%% Change these to your keywords.  Keywords are automatically printed at the end of the abstract.
 %%% This command must come BEFORE the end of the abstract.
-%%% If you don't want keywords, delete the command.
+%%% If you don't want keywords, omit the \keyword{..} command.
 \keywords{ASME, Paper, Template, {\upshape\LaTeX}, {\upshape\hologo{BibTeX}}}
- 
+
    
 %% Abstract should be no more than 250 words
 \begin{abstract}
-This paper is an example and 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. Standard {\upshape\LaTeX} commands are used. The class will lay out the author, title, and abstract in ASME style. The class will produce a pdf file that that includes hyperlinks, bookmarks, and pdf metadata. The class is intended to be used with the {\upshape\texttt{asmejour.bst} \hologo{BibTeX}} style for typesetting references, which is part of this distribution.  This style supports hyperlinks and modern reference formats, following current ASME practice. The class may be invoked with several options, most of which address math fonts. The class calls a number of packages, all of which are in {\upshape\TeX~Live} and in CTAN (\href{http://ctan.org}{ctan.org}). The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
+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} %% can modify this information as desired. 
+\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
 							%% This command must come somewhere before \maketitle
@@ -162,25 +155,25 @@
 
 \section{Introduction}
 
-The \texttt{asmejour} class file will typeset papers with margins, fonts, headings, captions, and reference formats that follow those used in journals published by the American Society of Mechanical Engineers (ASME). Internal and external hyperlinks will be set automatically, and the pdf file will contain bookmarks and metadata.
+The \texttt{asmejour} class typesets papers with margins, fonts, headings, captions, and reference formats that follow those used in journals published by the American Society of Mechanical Engineers (ASME). Internal and external hyperlinks will be set automatically, and the pdf file will contain bookmarks and metadata. Many other useful features are supported. 
 
-This class is not a publication of ASME. The intended use of this package is to allow authors to format their papers in ASME style prior to submission to an ASME journal for peer review.
+This class is not a publication of ASME, although the author has published in ASME journals since 1984. The intended use of this package is to allow authors to format their papers in ASME style prior to submission to an ASME journal for peer review.
 
-The \texttt{.tex} file may be written using standard \LaTeX\ commands, although some specific initial commands are needed to format the block containing the author[s], title, and abstract.
+The \texttt{.tex} file may be written using standard \LaTeX\ commands, although some specific initial commands are needed to format the block containing the author[s], title, and abstract. The class calls a number of packages, all of which are contained in up-to-date versions of \TeX~Live, Mac\TeX, and similar platforms. If you find that you are missing a package, you may obtain it at no cost from CTAN (\href{http://ctan.org}{ctan.org}). 
 
 \subsection{Essential Initial Commands}
-To begin, fill in the fields to be completed at top of the \texttt{asmejour-template.tex} file. The pdf metadata will be placed into the pdf file itself. 
+To begin, fill in the fields to be completed at top of the \texttt{asmejour-template.tex} file. The first are pdf metadata in the preamble that will tag the pdf file itself. Next is the \verb|\JourName{..}| command, which should be changed as appropriate (omit ``Journal of'').
 
 For each author, put author names and affiliation (with line breaks) into a separate \verb|\SetAuthorBlock{name}{affiliation}| command; follow the syntax illustrated \texttt{asmejour-template.tex} file.  One author (or more) may be designated as the corresponding author  by placing the command \verb|\CorrespondingAuthor| at the end of that name.  
 
-The title should be placed into \verb|\title{..}|, and line breaks may be specified if desired. Keywords may optionally be including using the \verb|\keywords{..}| command; this command \textit{must} be issued before the abstract. The abstract text must be placed into \verb|\begin{abstract}|\ldots\verb|\end{abstract}|. The abstract will automatically be italicized. 
+The title should be placed into \verb|\title{..}|, and line breaks may be specified if desired. Keywords may optionally be including using the \verb|\keywords{..}| command; this command \textit{must} be issued before the abstract. To omit keywords, just omit this command. Next, the abstract text must be placed into \verb|\begin{abstract}|\ldots\verb|\end{abstract}|. The abstract will automatically be italicized. 
 
-The date is given as an unnumbered footnote, which deafults to \verb|\today|. Other text for \verb|\date{..}| may be specified. Putting \verb|\date{}| will suppress the footnote.
+The date is automatically given as an unnumbered footnote, which deafults to \verb|\today|. Different text may be given using \verb|\date{..}|. Putting \verb|\date{}| will suppress the date footnote.
 
-After setting up the authors, title, and abstract, issue the \verb|\maketitle| command. 
+After setting up the authors, title, and abstract, issue the \verb|\maketitle| command. The introduction section comes next. 
 
 \subsection{Optional to the Color Title Bar}
-The vertical bar in the title block is black in all ASME journals. Since the \texttt{asmejour} class is only for preprints, we include the [fun] option to have the bar in color. Any color \texttt{name} recognized by the \texttt{xcolor} package may be invoked by including the option \texttt{barcolor=name} in the \verb|\documentclass[..]{asmejour}| command. The color name is \texttt{Red4} by default. (To have a black bar, either omit the option entirely or use the name \texttt{black}.)
+The vertical bar in the title block is black in all ASME journals. Since the \texttt{asmejour} class is only for preprints, we include the [fun] option to have the bar in color. Any color \texttt{name} recognized by the \texttt{xcolor} package may be invoked by including the option \texttt{[barcolor=name]} in the \verb|\documentclass[..]{asmejour}| command. The color for this example is \texttt{Goldenrod3}. To have a black bar, either omit \texttt{barcolor} entirely or use the name \texttt{black}.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -188,7 +181,7 @@
 
 For ASME papers, the labels Figure and Equation should be abbreviated when they do not start a sentence, as in Fig.~\ref{fig:1} and Eq.~\eqref{eqn:1}. Figure~\ref{fig:1} is spelled out when it starts a sentence. Equation~\eqref{eqn:1} is spelled out when it starts a sentence. 
 
-Citations will be numbered automatically \cite{DKE1969}. They should be inserted at the appropriate point using a \verb|\cite{ref}| command~\cite{toohey2007,gibson2008}. The citations will be automatically sorted and compressed, as well, if they are given in a set \cite{stevens1999, DKE1969, wions2006, oligaria2011, mollen2014, smith2014, apple2019}. If naming a reference explicitly, use an abbreviation in front of the number, as in Ref.~\cite{smith2014}. Reference~\cite{smith2014} is appropriate at the beginning of a sentence.
+Citations will be numbered automatically \cite{DKE1969}. They should be inserted at the appropriate point using a \verb|\cite{ref}| command~\cite{toohey2007,gibson2008}. The citations will be automatically sorted and compressed, as well, if they are given in a set \cite{stevens1999, DKE1969, wions2006, oligaria2011, mollen2014, smith2014, apple2019}. If naming a reference explicitly, put ``Ref.''\ in front of the number, as in Ref.~\cite{smith2014}. Reference~\cite{smith2014} is appropriate at the beginning of a sentence.
 See the \texttt{asmeconf-sample.bib} file for examples of how to enter your references.
 
 Equations are typeset in the usual way.  The class file loads the \texttt{amsmath} and \texttt{mathtools} packages. Further, the \texttt{newtxmath} package used for the math fonts includes many additional features.
@@ -197,7 +190,7 @@
 \end{equation}
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Section Headings and Captions}
 
 ASME requires that section headings and captions be set in bold face. In addition, the captions must be in sans serif type. The \texttt{asmejour} class will do this automatically.  You can place \verb|\cite{..}|, \verb|\ref{..}|, \verb|\label{..}|, and into headings and captions directly, as you would in the main text.  You can place \verb|\footnote{..}| into headings, but not into captions.\footnote{See \texttt{tex-stackexchange} for various approaches to footnotes in captions, if they seem necessary. For footnotes in tables, use the \texttt{tablefootnote} package.}
@@ -204,7 +197,7 @@
 
 Sections may either be numbered or left unnumbered. ASME publishes papers in either style.
 
-Math can be used in either captions or section headings, and an appropriate math font will be automatically selected. For a section heading that includes complicated math (and macros), you may use the optional argument of \verb|\section[..]{..}| to create a pdf bookmark without losing characters or producing warnings or errors. See the \texttt{asmejour-template.tex} source file for examples of this. These bookmarks should usually be text expressions, although some math is supported.  
+Math can be used in captions or section headings, and an appropriate math font will be automatically selected. For a section heading that includes complicated math (and macros), you may use the optional argument of \verb|\section[..]{..}| to create a pdf bookmark without losing characters or producing warnings or errors. See the \texttt{asmejour-template.tex} source file for examples of this technique. These bookmarks should usually be text expressions, although some math is supported.  
 
 If you wish to override the default math format in a heading or caption, put \verb|\mathversion{normal}| in the heading or caption. (The \texttt{newtxmath} package \cite{sharpe1} includes a complete set of bold math fonts, however, so the need to override should be rare.)
 
@@ -211,10 +204,10 @@
 Single-sentence captions should not end with a period. Multi-sentence captions do include periods.
 
 \subsection{Subsection Headings}
-Section, subsection, and subsubsection headings should be in title case (first letter of primary words capitalized). ASME does not use \verb|\paragraph|, so the class file treats this commands like \verb|\subsubsection|. 
+Section, subsection, and subsubsection headings should be in title case (first letter of primary words capitalized). ASME does not use \verb|\paragraph|, so the class file equates this command to \verb|\subsubsection|. 
 
 
-%%%%%%%%%%%%% begin figure %%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%% begin figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% captions go below figures
 \begin{figure}
@@ -222,63 +215,16 @@
 \caption{A figure caption with math, Eq.~\eqref{eqn:1}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
 \end{figure}
  
-%%%%%%%%%%%%% end figure %%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%% end figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{More on Math}
-
-To get bold math outside of the captions, you can use the \verb|\bm{..}| macro from the \texttt{bm} package, which is loaded by the class.
-
-\begin{equation}
-\bm{ S = k \ln w}
-\end{equation}
-
-Math italics are used for roman and lower-case greek letters by default.  If you want an upright letter in math, you can use the relevant math alphabet, e.g., \verb|\mathrm, \mathbf, \mathsf|:
-\begin{equation}\label{eqn:newton2}
-\vec{F} = m \vec{a} \quad\textrm{or}\quad \vec{\mathrm{F}} = m \vec{\mathrm{a}} \quad\textrm{or}\quad \mathbf{F} = m \mathbf{a} \quad\textrm{or}\quad \vec{\mathsf{F}} = m \vec{\mathsf{a}}
-\end{equation}
-
-ASME typesets vectors in upright bold, like the third instance in Eq.\ \eqref{eqn:newton2}, and sets matrices in bold italic. In the next equation $\mathbf{w}$ is a vector and  $\bm{J}_1$ is a matrix:
-\begin{equation}\label{eqn:dw}
-d\mathbf{w} =
-   \begin{pmatrix}
- 	du \\ dv
-   \end{pmatrix} = 
-   \underbrace{\begin{pmatrix}
-	 \partial u/\partial x &  \partial u/\partial y \\
-	 \partial v/\partial x &  \partial v/\partial y
-   \end{pmatrix}}_{=\,\bm{J}_1}  \begin{pmatrix}
- 	dx \\ dy
-   \end{pmatrix} 
-\end{equation}
-
-The \texttt{newtxmath} package includes a large number of options for mathematics, most of which can be called as options to \verb|\documentclass|. For example, the \texttt{upint} option of \texttt{newtxmath} selects upright integral signs (rather than slanted integral signs):
-\begin{quote}
-\verb|\documentclass[upint]{asmejour}|. 
-\end{quote}  
-These math options are discussed further in the \texttt{asmejour-template.tex} file. 
-
-In addition, many options for calligraphic, script, and fraktur fonts are available as options to the \texttt{mathalfa} package, which is also loaded. These may be invoked, for example, as 
-\begin{quote}
-\verb|\documentclass[mathalfa=cal=euler]{asmejour}| 
-\end{quote}
-which selects the Euler font for \verb|\mathcal|, as in $A \in \mathcal{P}(A)$. %($\mathcal{T}_1 \subset \mathcal{T}_2$) 
-To find all the font options, refer to the \texttt{mathalfa} documentation \cite{sharpe2}. 
-
-The typewriter font loaded is \texttt{inconsolata} (which is sans serif), as suggested by the \texttt{newtx} package documentation. The class is not set up for use with the \texttt{fontspec} or \texttt{unicode-math} packages.
-
-
-\subsection{Units and Nomenclature} ASME requires SI units. U.S.\ style units may be follow in parentheses. Be sure to put your symbols into the nomenclature list, including the SI units.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Tables and Figures}
 
 Table \ref{tab:1} is an example of a simple table. Table captions should be placed above tables.
-The class loads the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (used in Tables \ref{tab:2} and \ref{tab:3}). Table~\ref{tab:3} is designed to have exactly the width of a text column. 
+The class loads the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (used in Tables \ref{tab:2} and \ref{tab:3}). Table~\ref{tab:3} is coded to have exactly the width of a text column. 
 
-The \texttt{booktabs} package \cite{fear} is loaded (and customized) to provide versions of \verb|\toprule|, \verb|\midrule|, and \verb|\bottomrule}| appropriate to ASME-style tables.
+The \texttt{booktabs} package \cite{fear} is loaded (and customized) to provide versions of \verb|\toprule|, \verb|\midrule|, and \verb|\bottomrule| appropriate to ASME-style tables.
 
 Table~\ref{tab:4} shows a table that spans both text columns. Figure~\ref{fig:2} shows a figure spanning both columns. Two column tables and figures will always float to the top of a later page. Subframes in figures, such as  Fig.~\ref{fig:interior-region}, may be referenced individually.
 
@@ -286,29 +232,9 @@
 
 Landscape figures and tables may be produced at full-page size by putting \verb|\usepackage[figuresright]{rotating}| in your \texttt{.tex} file's preamble and using the \texttt{sidewaystable*} and \texttt{sidewaysfigure*} environments~\cite{fairbairns}.
 
-%%%%%%%%%%%%%%% begin simple table %%%%%%%%%%%%%%%%%%%%%%%%%% 
 
-%% captions go above tables
+%%%%%%%%%%%%%%%%%  begin two column figure  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\begin{table}[t]
-\caption{A simple table\label{tab:1}}
-\centering{%
-\begin{tabular}{l l r}
-\toprule
-Experiment & $u$ [m/s] & $T$ [\textdegree C] \\
-\midrule
-Run 11 & 12.5 & 103.4 \\
-Run 12 & 24   & 68.3 \\
-\bottomrule
-\end{tabular}
-}%
-\end{table}
-
-%%%%%%%%%%%%%%%% end table  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-
-
-%%%%%%%%%%%%%%%%%  begin two column figure  %%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 \begin{figure*}[t]
 \begin{subfigure}[t]{0.5\textwidth} % You will get same result using \begin{minipage}[t]{0.5\textwidth}
 \vbox{
@@ -318,48 +244,55 @@
 }
 \vspace*{1.7em}
 }
-\subcaption{Interior region\label{fig:interior-region}}
+\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{Exterior region\label{fig:exterior-region}}
+\subcaption{\label{fig:exterior-region}}
 }\end{subfigure}%
-\caption{A figure with two subfigures \cite{Lienhard2019b}\label{fig:2}}
+\caption{A figure with two subfigures: \subref{fig:interior-region} interior region, and \subref{fig:exterior-region} exterior region \cite{Lienhard2019b}\label{fig:2}}
 \end{figure*}
 
-%%%%%%%%%%%%%%%%%%%  end two column 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 early 2020. 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.
+The {\upshape\texttt{asmejour.bst}} \hologo{BibTeX} style follows the reference styles observed in ASME journals in 2020.\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.
 Nevertheless, a few comments are necessary. 
 
-\subsection{Hyperlinked Titles and Numbers} When the entries \verb|@article{..|, \verb|@book{..|, \verb|@inbook{..|, \verb|@incollection{..|, \verb|@proceedings{..|, or \verb|@techreport{..| include \verb|doi={..}|, the document title, paper number, or report number will be hyperlinked to that doi number, and the doi number will not be printed. If no doi is included, but a url or eprint is included, then the title will be hyperlinked to that url or eprint. To display the doi (or the url or eprint when no doi is given), put it into the \verb|note={..}| field (using \verb|\doi{..| or \verb|\url{..| ):
+\subsection{Capitalization of Titles} ASME's bibliography style requires that titles be in title case. The first letters of principal words are capitalized. This must be done when writing the \texttt{.bib} file.
+%(ASME capitalizes ``With'', but not other prepositions).
+
+\subsection{Hyperlinked Titles or Paper Numbers} When the entries \verb|@article{..|, \verb|@book{..|, \verb|@inbook{..|, \verb|@incollection{..|, \verb|@proceedings{..|, or \verb|@techreport{..| include \verb|doi={..}|, the document title, paper number, or report number will be hyperlinked to that doi number, and the doi number will not be printed. If no doi is included, but a url or eprint is included, then the title will be hyperlinked to that url or eprint. To display the doi (or the url or eprint when no doi is given), put it into the \verb|note={..}| field (using \verb|\doi{..| or \verb|\url{..| ):
 \begin{quote}
 \verb|note = {\doi{10.1115/1.4042912}}|
 \end{quote}
 Include doi numbers in references whenever possible.
 
-\subsection{eprint Support} Elementary support for \texttt{eprint} numbers is included, either hyperlinking or generating a url at the end of the citation. The \texttt{archive} type may be specified using the macros \texttt{arxiv, googlebooks, hndl, jstore, oclc}, or \texttt{pubmed} (e.g., \texttt{archive=hndl},  \textit{without} braces). Both \texttt{eprint} and \texttt{archive} fields \textit{must} be given. Other root urls may be invoked using \verb|archive = {http://another.url.org/}|.
+%%%%%%%%%%%%%%% begin simple table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 
-\subsection{Online Sources} A bibliography field \verb|@online{..| is included for citation of online sources, such as web pages. A \texttt{url}, \texttt{doi}, or \texttt{eprint} with \texttt{archive} should be included. See the examples of use in the \texttt{asmejour-sample.bib} file. 
+%% captions go above tables
 
-\subsection{Date Accessed} The \verb|urldate={..}| field may be used to provide the date on which a given url was accessed. By default, the text printed will be \texttt{accessed `date',}. The word ``accessed'' may be changed using the \verb|urltype={..}| field.
+\begin{table}[t]
+\caption{A simple table\label{tab:1}}
+\centering{%
+\begin{tabular}{l l r}
+\toprule
+Experiment & $u$ [m/s] & $T$ [\textdegree C] \\
+\midrule
+Run 11 & 12.5 & 103.4 \\
+Run 12 & 24   & 68.3 \\
+\bottomrule
+\end{tabular}
+}%
+\end{table}
 
-\subsection{Conference Location and Date} For the entry types \verb|@inproceeedings{..| and \verb|@proceeedings{..|, you may include \verb|venue={..}| and \verb|eventdate={..}| to specify the city and the date of a conference. Omit \verb|address={..}| if \verb|venue={..}| is used.
+%%%%%%%%%%%%%%%%%  end table  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 
-\subsection{Version Number\protect\footnote{Footnotes can appear in \texttt{\string\section} commands. However, when the \texttt{[lineno]} option is used either: i) write \texttt{\string\protect\string\footnote\{..\}}; or ii) include the optional argument, as in \texttt{\string\section[Foo]\{Foo\string\footnote\{..\}\}}.\label{ftnt:3}}} 
-The \verb|version={..}| field may be used with \verb|@book|, \verb|@online|, and \verb|@manual|. By default, the text will read \texttt{Version `number'} as in Refs.~\cite{sharpe1,sharpe2},  but different wording may be selected using the \verb|versiontype={..}| field, to have ``Revision''  or something similar, as in Ref.~\cite{GSL}. ASME often puts the version in the title, as in Refs.~\cite{dlmf, texshop}, so I've left the final decision for discussion between the authors and the copy editor.
-
-\subsection{Capitalization of Titles} ASME's bibliography style requires that titles be in title case. The first letters of principal words are capitalized. This must be done when writing the \texttt{.bib} file.
-%(ASME capitalizes ``With'', but not other prepositions).
-
-\subsection{Articles in Collections} In addition to the standard entry, \verb|@incollection{..|, an entry  \verb|@inserialcollection{..| is defined for serials in which each volume has a different title. See the \texttt{asmejour-sample.bib} file for discussion and compare Ref.~\cite{clauser56} to Ref.~\cite{DKE70}.
-
-
 %%%%%%%%%%%%%%% begin more complicated table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{table}[t]
@@ -377,12 +310,97 @@
 }%
 \end{table}
 
-%%%%%%%%%%%%%%%% end table  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+%%%%%%%%%%%%%%%% end table  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 
+\subsection{eprint Support} Elementary support for \texttt{eprint} numbers is included, either hyperlinking or generating a url at the end of the citation. The \texttt{archive} type may be specified using the macros \texttt{arxiv, googlebooks, hndl, jstore, oclc}, or \texttt{pubmed} (e.g., \texttt{archive=hndl},  \textit{without} braces). Both \texttt{eprint} and \texttt{archive} fields \textit{must} be given. Other root urls may be invoked using \verb|archive = {http://another.url.org/}|.
 
+\subsection{Online Sources} A bibliography field \verb|@online{..| is included for citation of online sources, such as web pages. A \texttt{url}, \texttt{doi}, or \texttt{eprint} with \texttt{archive} should be included. See the examples of use in the \texttt{asmejour-sample.bib} file. 
+
+\subsection{Date Accessed} The \verb|urldate={..}| field may be used to provide the date on which a given url was accessed. By default, the text printed will be \texttt{accessed `date',}. The word ``accessed'' may be changed using the \verb|urltype={..}| field.
+
+\subsection{Conference Location and Date} For the entry types \verb|@inproceeedings{..| and \verb|@proceeedings{..|, you may include \verb|venue={..}| and \verb|eventdate={..}| to specify the city and the date of a conference. Omit \verb|address={..}| if \verb|venue={..}| is used.
+
+\subsection{Version Number\protect\footnote{Footnotes can appear in \texttt{\string\section} commands. However, when the \texttt{[lineno]} option is used either: i) write \texttt{\string\protect\string\footnote\{..\}}; or ii) include the optional argument, as in \texttt{\string\section[Foo]\{Foo\string\footnote\{..\}\}}.\label{ftnt:3}}} 
+The \verb|version={..}| field may be used with \verb|@book|, \verb|@online|, and \verb|@manual|. By default, the text will read \texttt{Version `number'} as in Refs.~\cite{sharpe1,sharpe2},  but different wording may be selected using the \verb|versiontype={..}| field, to have ``Revision''  or something similar, as in Ref.~\cite{GSL}. ASME often puts the version in the title, as in Refs.~\cite{dlmf, texshop}, so I've left the final decision for discussion between the authors and the copy editor.
+
+\subsection{Articles in Collections} In addition to the standard entry, \verb|@incollection{..|, an entry  \verb|@inserialcollection{..| is defined for serials in which each volume has a different title. See the \texttt{asmejour-sample.bib} file for discussion and compare Ref.~\cite{clauser56} to Ref.~\cite{DKE70}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section{More on Math}
+Math italics are used for roman and lower-case greek letters by default.  If you want an upright letter in math, you can use the relevant math alphabet, e.g., \verb|\mathrm, \mathbf, \mathsf|:
+\begin{equation}\label{eqn:newton2}
+\vec{F} = m \vec{a} \quad\textrm{or}\quad \vec{\mathrm{F}} = m \vec{\mathrm{a}} \quad\textrm{or}\quad \mathbf{F} = m \mathbf{a} \quad\textrm{or}\quad \vec{\mathsf{F}} = m \vec{\mathsf{a}}
+\end{equation}
+
+ASME typesets vectors in upright bold, like the third instance in Eq.\ \eqref{eqn:newton2}, and sets matrices in bold italic. In the next equation, $\mathbf{w}$ is a vector and  $\bm{J}_1$ is a matrix:
+\begin{equation}\label{eqn:dw}
+d\mathbf{w} =
+   \begin{pmatrix}
+ 	du \\ dv
+   \end{pmatrix} = 
+   \underbrace{\begin{pmatrix}
+	 \partial u/\partial x &  \partial u/\partial y \\
+	 \partial v/\partial x &  \partial v/\partial y
+   \end{pmatrix}}_{=\,\bm{J}_1}  \begin{pmatrix}
+ 	dx \\ dy
+   \end{pmatrix} 
+\end{equation}
+
+To get additional symbols in bold math, you can use the \verb|\bm{..}| macro from the \texttt{bm} package, which is loaded by the class
+\begin{equation}
+\mathbf{u}_r = u_r\bm{\hat{\textbf{\i}}}+v_r\bm{\hat{\textbf{\j}}}+w_r\bm{\hat{\textbf{k}}}
+\end{equation}
+or, \textit{very} rarely, \verb|\mathversion{bold}| for an entire equation: 
+\mathversion{bold}\begin{equation}
+S = k \ln w = k \ln \biggl(\frac{N!}{\prod_i N_i!}\biggr)
+\end{equation}
+\mathversion{normal}% avoid extra line break with %
+
+In most cases, long equations can be kept below the column width by using one of the multiline equation environments defined by \texttt{amsmath}, 
+such as \texttt{align}, \texttt{split}, or \texttt{multline}~\cite{amsmath}. The following equation is set with the \texttt{multline} environment:
+\begin{multline}
+\frac{\partial}{\partial t}\left[\rho\Bigl(e + \lVert\mathbf{u}\rVert^2\mspace{-3mu}\big/2\Bigr)\right]  + \nabla\cdot\left[\rho\Bigl(h + \lVert\mathbf{u}\rVert^2\mspace{-3mu}\big/2 \Bigr)\mathbf{u}\right]\\
+ ={}-\nabla \cdot \mathbf{q} +  \rho \mathbf{u}\cdot\mathbf{g}+ \frac{\partial}{\partial x_j}\bigl(d_{ji}u_i\bigr) + \dot{Q}_v\label{eqn:energy}
+\end{multline}
+An example using \texttt{align} appears in Appendix~\ref{app:zetafunction}. 
+
+An alternative solution may be to set large equations into two-column-wide tables or figures. While a package exists for setting equations that span two columns (\texttt{widetext.sty}), that code is erratic in relation to floats and page breaks.
+
+\subsection{\texttt{newtxmath} and \texttt{mathalpha}} The \texttt{newtxmath} package~\cite{sharpe1}, loaded by default, includes a large number of options for mathematics, most of which can be called as options to \verb|\documentclass|. For example, the \texttt{upint} option of \texttt{newtxmath} selects upright integral signs (rather than slanted integral signs):
+\begin{quote}
+\verb|\documentclass[upint]{asmejour}|. 
+\end{quote}  
+The option \verb|subscriptcorrection| improves the spacing of math subscripts. Math options are discussed further in the \texttt{asmejour-template.tex} file. 
+
+In addition, many options for calligraphic, script, and fraktur fonts are available through the \texttt{mathalfa} package, which is also loaded. These may be invoked, for example, as 
+\begin{quote}
+\verb|\documentclass[mathalfa=cal=euler]{asmejour}| 
+\end{quote}
+which selects the Euler font for \verb|\mathcal|, as in $A \in \mathcal{P}(A)$. %($\mathcal{T}_1 \subset \mathcal{T}_2$) 
+To see all the font options, refer to the \texttt{mathalfa} documentation \cite{sharpe2}. 
+
+The class is designed for use with \texttt{newtxmath} and does not support the \texttt{unicode-math} package.
+
+%% Dealing with complicated math in a section heading: optional argument of \section provides the pdfbookmark
+%%    without losing characters or producing warnings/errors. Note that bookmark can include simple math and \eqref{..}.
+%% newtxmath provides the option for upright Greek letters as \upomega (vs. \omega), etc.
+\subsection[Math in a Section Heading: \omega\cdot U=0]{Math in a Section Heading: $\tilde{\upomega}\cdot\hat{\mathrm{U}}=0$}
+
+To include complicated math in a section heading without producing bookmark-related errors, use the optional argument of \verb|\section| to create the pdfbookmark. The heading above was set with the following command:
+\begin{quote}\raggedright
+\verb|\subsection[Math in a Section Heading:| 
+\hspace*{1em}\verb|\omega\cdot U=0]{Math in a Section Heading:|
+\hspace*{1em}\verb|$\tilde{\upomega}\cdot\hat{\mathrm{U}}=0$}|
+\end{quote}
+Note that bookmarks can include simple math. Also note that \texttt{newtxmath} provides the option to obtain upright Greek letters, such as \verb|\upomega| (vs.\ \verb|\omega|).
+
+
+\subsection{Units and Nomenclature} ASME requires SI units. U.~S.\ style units may be follow in parentheses. Be sure to put your symbols into the nomenclature list, including the SI units.
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Additional Options for \texttt{asmejour.cls}}
-The class accepts a number of options in addition to those already described.
+%The class accepts a number of options in addition to those already described.
 
 \subsection{Lists of Figures and Tables} A list of figures and a list of tables are generated automatically as the last page.  To omit these lists, use the option \texttt{[nolists]}.
 
@@ -389,17 +407,17 @@
 \subsection{Final Column Balancing} The option \texttt{[balance]} invokes the the \texttt{flushend} package~\cite{tolusis}.
 This package will attempt to give equal height to the two columns on the last page. The performance of this package is sometimes inconsistent (with odd page layout or, very rarely, errors), so use this option with caution.
 
-\subsection{Line Numbers} The option \texttt{[lineno]} invokes the the \texttt{lineno} package~\cite{bottcher}.  This will produce line numbers in the margins. You must run \LaTeX\ twice for proper placement of the numbers. The \texttt{lineno} package is not compatible with the \texttt{flushend} package that makes final short columns the same height. Balancing is disabled when this option is called. See the documentation of the \texttt{lineno} package for further commands to control line numbering. See footnote~\ref{ftnt:3} with regard to footnotes in section headings while this option is in~effect. The abstract, tables, captions, and footnotes will not be numbered.
+\subsection{Line Numbers} The option \texttt{[lineno]} invokes the the \texttt{lineno} package~\cite{bottcher}.  This will produce line numbers in the margins. You must run \LaTeX\ \textit{twice} for proper placement of the numbers. The \texttt{lineno} package is not compatible with the \texttt{flushend} package that makes final short columns the same height. Balancing is disabled when this option is called. See the documentation of the \texttt{lineno} package for further commands to control line numbering. See footnote~\ref{ftnt:3} with regard to footnotes in section headings while this option is in~effect. The abstract, tables, captions, and footnotes will not be numbered.
 
 \subsection{Changing the Footer Text}\label{sec:footer} The option \texttt{[nofoot]} will omit everything other than a page number from the page footer.  The option \texttt{nocopyright} will omit the ASME copyright from the first page footer. The command \verb|\PreprintString{..}| replaces the words \textsf{PREPRINT FOR REVIEW}. The left and right preprint strings can be changed separately using an optional argument: \verb|\PreprintString{..}[L]| and \verb|\PreprintString{..}[R]|.
 The final paper number may be added to the page number using \verb|\PaperNumber{..}|.
 
-The footers are all generated with the \texttt{fancyhdr} package~\cite{oostrum}, so you can change them in any way you like using the commands of that package. 
+The footers are all generated with the \texttt{fancyhdr} package~\cite{oostrum}, and you can change them using the commands of that package. 
 
-\subsection{Superiors Font} The \texttt{newtxtext} package includes a superiors font (both numbers and letters) for use in footnote markers and superscripts. To enable this font, use the option \texttt{[nodefaultsups]}. The corresponding author mark in the author block will not change.
-
 \subsection{Vertical Space on Title Page} The space between the author/title/abstract block and the main text defaults to 12.5~mm. Infrequently, a different value may be desirable.  The space can be changed using \verb|\AbstractSep{..}|, where the argument is a \LaTeX\ dimension with units (e.g., 5mm).
 
+\subsection{Federal Copyright Notices} Several types of copyright statement can be placed an unnumbered footnote on the first page. Use the option \texttt{[govt]} when all authors are federal employees, \texttt{[govtsome]} when some authors are federal employees, and \texttt{[contractor]} when the authors are federal contractors.
+
 \subsection{Archivability:~PDF/A} Compliance with PDF/A standards can be enabled using the option \texttt{[pdf-a]} 
 when running with \hologo{pdfLaTeX}. The 
 default setting is for PDF/A-3u with sRGB OutputIntent (\texttt{sRGB.icc}). If levels 1b, 2b, 2u, or 3b are preferred, use the
@@ -406,7 +424,11 @@
 options \texttt{[pdfapart=1 or 2 or 3]} and  \texttt{[pdfaconformance=b or u]}. Note that accessible 
 conformance~(\texttt{a}) is not currently possible with \LaTeX.
 
+\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. (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.%(This option is not available if the \texttt{[fontspec]} option is used.)
+
+
 %%%%%%%%%%%%%%%%%%%  begin linewidth table  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{table}[t]
@@ -459,28 +481,10 @@
 \end{table*}
 %%%%%%%%%%%%%%%% end two column table %%%%%%%%%%%%%%%%%%% 
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Dealing with complicated math in a section heading: optional argument of \section provides the pdfbookmark
-%%   without losing characters or producing warnings/errors. Note that bookmark can include simple math and \eqref{..}.
-%%
-%% Newtxmath provides the option for upright Greek letters as \upomega (vs. \omega), etc.
-%%
-\section[Math in a Section Heading: \omega\cdot U=0]{Math in a Section Heading: $\hat{\upomega}\cdot\hat{\mathrm{U}}=0$}
-
-To include complicated math in a section heading without producing bookmark-related errors, use the optional argument of \verb|\section| to create the pdfbookmark. The heading above was set with the following command:
-\begin{quote}\raggedright
-\verb|\section*[Math in a Section Heading:| 
-\hspace*{1em}\verb|\omega\cdot U=0]{Math in a Section Heading:|
-\hspace*{1em}\verb|$\hat{\upomega}\cdot\hat{\mathrm{U}}=0$}|
-\end{quote}
-Note that bookmarks can include simple math. Also note that \texttt{newtxmath} provides the option to obtain upright Greek letters as \verb|\upomega| (vs.\ \verb|\omega|), etc.
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Summary}
+\section{Conclusions}
 The class \texttt{asmejour} and associated files are for typesetting preprints in the style of ASME journals.
-Documentation is provided in this file and by comments in the \texttt{.tex} source code. Examples of entering references are shown in the \texttt{asmejour-sample.bib} file.  The \texttt{asemjour.bst} file produces references following ASME's current formats.  This package is not a publication of ASME and is offered without charge under the terms of the \href{https://ctan.org/license/mit}{MIT license}. 
+Documentation is provided in this file and by comments in the \texttt{.tex} source code. Examples of references are shown in the \texttt{asmejour-sample.bib} file.  The \texttt{asemjour.bst} file produces references following ASME's current formats.  The code is compatible with both {\hologo{pdfLaTeX}} and \LuaLaTeX. This package is not a publication of ASME and is offered at no cost under the terms of the \href{https://ctan.org/license/mit}{MIT license}. 
 
 \begin{enumerate}
 \item First conclusion 
@@ -506,7 +510,9 @@
 %%
 %% Name of nomenclature can be changed using an optional argument to the environment.
 %%
-%% Leave off second argument of \entry to produce a subheading (e.g., \entry{Greek letters}  )
+%% \EntryHeading{Greek Letters}
+%% \entry{symbol}{definition}
+%%
 %% Must run latex twice to align the columns.
 
 \begin{nomenclature}
@@ -515,14 +521,15 @@
 \entry{$k$}{thermal conductivity (W m$^{-1}$ K$^{-1}$)}
 \entry{$\mathbf{q}$}{heat flux vector (W m$^{-2}$)}
 
-\entry{Greek Letters}
+\EntryHeading{Greek Letters}
 \entry{$\alpha$}{thermal diffusivity (m$^2$ s$^{-1}$)}
 \entry{$\nu$}{kinematic viscosity (m$^2$ s$^{-1}$)}
 
-\entry{Dimensionless Groups}
+\EntryHeading{Dimensionless Groups}
 \entry{Pr}{Prandtl number, $\nu/\alpha$}
+\entry{Sc}{Schmidt number, $\nu/\mathcal{D}_{1,2}$}
 
-\entry{Superscripts and Subscripts}
+\EntryHeading{Superscripts and Subscripts}
 \entry{b}{bulk value}
 \entry{$\infty$}{free stream value}
 
@@ -539,14 +546,9 @@
 \appendix   %%% starting appendices
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Dealing with Wide Equations}
-
-In most cases, the need for a wide equation can be eliminated by using one of the multiline equation environments defined by \texttt{amsmath}, such as \texttt{align}, \texttt{split}, or \texttt{multline}~\cite{amsmath}. An example appears in Appendix~\ref{app:zetafunction}. An alternative solution may be to set large equations into two-column-wide tables or figures. While a package exists for setting equations that span two columns (\texttt{widetext.sty}), that code is erratic in relation to floats and page breaks.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Incomplete Zeta Function~\cite{Lienhard2019c}\label{app:zetafunction}}
 
-This text is just an illustration. The radiation fractional function may be written in terms of the incomplete zeta function for convenience:
+This text is just for illustration. The radiation fractional function may be written in terms of the incomplete zeta function for convenience:
 \begin{align}
 f(\lambda T)  = {}&  \frac{1}{\sigma T^4} \int_0^\lambda\frac{2\pi h c_o^2}{\lambda^5 \left[ \exp (h c_o/k_B T \lambda) - 1\right] } \, d\lambda \\
  = {}&  \frac{1}{\sigma T^4}\frac{2\pi k_B^4 T^4}{h^3c_o^2}\int^\infty_{c_2/\lambda T}\frac{t^3}{e^t -1}\, dt\label{eqn:zeta}
@@ -553,7 +555,7 @@
 \end{align}
 When $\lambda T \rightarrow \infty$, $f = 1$ and the last equation yields the well-known result
 \begin{equation}
- {\sigma T^4} =\frac{2\pi k_B^4 T^4}{h^3c_o^2} \underbrace{\int_0^\infty \frac{t^3}{e^t - 1} \, dt}_{\equiv \zetaup(4)\Gamma(4)} 
+ {\sigma T^4} =\frac{2\pi k_B^4 T^4}{h^3c_o^2} \underbrace{\int_0^\infty \frac{t^3}{e^t - 1} \, dt}_{\equiv\mspace{2mu} \zetaup(4)\Gamma(4)} 
 \end{equation}
 where the Gamma function $\Gamma(4) = 3!$ and the Riemann zeta function, $\zetaup(4)$, has the indicated integral representation \cite[\S13.12]{ww1927}.  A classical result due to Euler \cite{euler1740} gives $\zetaup(4) = \pi^4/90$ (see also \cite[\S167]{euler1748}), from which we recover the usual definition of the  Stefan-Boltzmann constant, $\sigma$. 
 
@@ -561,13 +563,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Language Support}
 
-ASME publishes in English, but the \texttt{babel} package is loaded for 
-users who may wish to include other languages. Options are supported to load a primary language, \texttt{lang=}, as well
-as a secondary and tertiary language, \texttt{lang-second} and \texttt{lang-third}.  The primary language must be given as the \textit{last} language option in  \verb|\documentclass|.  
+ASME publishes in English, but the \texttt{babel} package is loaded for users who may wish to include other languages. 
+For example, an author might wish to include an appendix that provides the abstract in another language.
 
-If no language option is given, the package defaults to English. The standard caption and section names will follow \texttt{babel}'s dictionary for primary languages other than English.  Users may additionally change ``Keywords'', ``Nomenclature'', and  ``Corresponding author'' by renewing the commands \verb|\keywordname|, \verb|\nomname|, and \verb|\CAwords|. Changes to the page footer were described in Sec.~\ref{sec:footer}. The pdf bookmark for ``Appendices'' by be changed by renewing \verb|\appendicesname|.
+When more than one language option is included in \verb|\documentclass[..]{asmejour}|, English will be 
+assumed to be the main language of the document. (To choose a different main language, set \texttt{[main=..]}).
+If no language options are given, the package defaults to English.  As an example, a passage in French is 
+shown in \selectlanguage{french}\appendixname~\ref{app:fourier}\selectlanguage{english}.
 
-An example of use is shown in \selectlanguage{french}\appendixname\ \ref{app:fourier}.\selectlanguage{english}
+The standard caption and section names will follow \texttt{babel}'s dictionary for primary languages other than English.  Users may additionally change ``Keywords'', ``Nomenclature'', and  ``Corresponding author'' by renewing the commands \verb|\keywordname|, \verb|\nomname|, and \verb|\CAwords|. Changes to the page footer were described in Sec.~\ref{sec:footer}. The pdf bookmark for ``Appendices'' by be changed by renewing \verb|\appendicesname|.
 
 The font encoding is set to T1 and utf-8 input is supported:
 %% If you have trouble with the next line (or the French text that follows), your file may not be saved in utf-8 format. You can delete these lines to resolve the issue.
@@ -574,12 +578,11 @@
 \typeout{If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.}
 àáâäæãåā  èéęëêēė  îïíīįì ôöòóœøōõ ûüùúū çćč ł ñń ßśš ÿ žźż
  
-No effort has been made to support customization of language-specific fonts, although this is possible by modifying the class file (examples are given in the \texttt{newtx} documentation). The bibliography style, \texttt{asmejour.bst}, is designed in English and aimed at \texttt{BibTeX}.  Multilingual bibliographies can be supported using \texttt{BibLaTeX}.
+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}
-
 Les causes primordiales ne nous sont point con­nues; mais elles sont assujetties à des lois simples et constantes, que l'on peut découvrir par l'obser­vation, et dont l'étude est l'objet de la philosophie naturelle. 
 
 La chale ur pénètre, comme la gravité, toutes les substances de l'univers, ses rayons occupent toutes les parties de l'espace. Le but de notre ouvrage est d'exposer les lois mathématiques que suit cet élé­ment. Cette théorie formera désormais une des branches les plus importantes de la physique gé­nérale~\cite{fourier1822}. 

Modified: trunk/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/asmejour/asmejour.cls	2021-02-02 22:14:17 UTC (rev 57597)
+++ trunk/Master/texmf-dist/tex/latex/asmejour/asmejour.cls	2021-02-02 22:14:35 UTC (rev 57598)
@@ -1,14 +1,13 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
-%%  This file provides the asmejour class for formatting papers in a layout similar to 
-%%  ASME Journal papers.
-%%
+%%  This file provides the asmejour class for formatting papers in a layout similar to ASME Journal papers.
+%%  
 %%  The asmejour.cls file should be used with the files asmejour.bst (for citations) and asmejour-template.tex.
 %%
 %%
-%%  This file is version 1.14 dated 2020/08/12.
-		\def\versionno{1.14}
-		\def\versiondate{2020/08/12\space}
+%%  This file's version and date are:
+		\def\versionno{1.15}
+		\def\versiondate{2021/02/01\space}
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -15,26 +14,35 @@
 %%          Massachusetts Institute of Technology
 %%          Cambridge, MA 02139-4307 USA
 %%
-%%  This class is compatible with either pdfLaTeX or LuaLaTeX. The class calls a number of packages,
-%%  many of which are part of the standard LaTeX distribution, and all of which are in TeXLive and
-%%  CTAN (https://ctan.org/). 
+%%  This class was designed to approach the following aims:
 %%
-%%  The Times/Helvetica style fonts are from Michael Sharpe's excellent newtxtext and newtxmath packages.
-%%  This class is not designed for unicode-math or fontspec.
+%%          1. Match ASME's current layout and font specifications
+%%          2. With amsejour.bst, match ASME's reference formats and support DOI & URL fields
+%%          3. Provide hyperref compatibility for hyperlinks, pdf bookmarks, and metadata
+%%          4. Support citations, footnotes, and bold face math in section headings
+%%			5. Provide optional line numbers for editing and review
+%%			6. Support balancing height of columns on the last page
+%%			7. Support the archival PDF/A standards 1b, 2b, 2u, 3b, and 3u
+%%			8. Provide copyright notices for government employees and government contractors
+%%		    9. Enable various math and text features from the newtxmath, mathalfa, and newtxtext packages
+%%		   10. Support inclusion of passages in languages other than English
 %%
-%%  Options for the class are described on lines 61-216. 
+%%  This class is compatible with either pdfLaTeX or LuaLaTeX. All packages required by the class 
+%%  are in standard distributions, such as TeXLive, and are also available at CTAN (https://ctan.org/). 
 %%
-%%  The class defines an environment for nomenclature. LaTeX must be run twice to align those columns.
+%%  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).
 %% 
-%%  The title block is set by a specific group of commands which are described in the asmejour-template.tex file.
-%% 
-%%  The \section[]{} command's optional argument is changed to provide pdf bookmarks when necessary.
-%%
  %=========================================================
 %%
 %% LICENSE:
 %%
-%% Copyright (c) 2020 John H. Lienhard
+%% Copyright (c) 2021 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, 
@@ -58,31 +66,14 @@
 
 \LoadClass[twoside,9pt,twocolumn]{extarticle}
 
-%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+\RequirePackage{xparse}%    \entry{} command uses deprecated g argument; will drop this eventually
+\RequirePackage{etoolbox}%  dropped xpatch 28/02/20
 \RequirePackage{ifthen}
-\RequirePackage{iftex} % check whether pdftex or another engine is used
+\RequirePackage{iftex}%     check whether pdftex or another engine is used
 
-\newboolean{DefaultSups}
-\setboolean{DefaultSups}{true}
+%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\newboolean{lineno}
-\setboolean{lineno}{false}
-
-\newboolean{balance}
-\setboolean{balance}{false}
-
-\newboolean{lists}
-\setboolean{lists}{true}
-
-\newboolean{setpdfa}
-\setboolean{setpdfa}{false}
-\newboolean{pdfaone}
-\setboolean{pdfaone}{false}
-
-
-\RequirePackage{kvoptions}
-%\RequirePackage{kvsetkeys} %<== this package is called by kvoptions
+\RequirePackage{kvoptions}% this package calls kvsetkeys
 \SetupKeyvalOptions{
   family=asmejour,
   prefix=asmejour@,
@@ -91,67 +82,89 @@
   setkeys=\kvsetkeys,
 }
 
-%%% for mathalfa, so we may pass options in this format:  mathalfa=cal=euler, mathalfa=frak=boondox
+%% for mathalfa, so we may pass options in this format: mathalfa=cal=euler, mathalfa=frak=boondox
 \define at key{asmejour}{mathalfa}{%
       \PassOptionsToPackage{#1}{mathalfa}%
 }
 
-%%% set key [nodefaultsups] to obtain newtx superiors font for footnotes.
+%% set key [nodefaultsups] to obtain newtx superiors font for footnotes.
+\newboolean{DefaultSups}\setboolean{DefaultSups}{true}
 \define at key{asmejour}{nodefaultsups}[false]{%
       \setboolean{DefaultSups}{#1}
 }
 
-%%% set barcolor= to a value defined by xcolor package
+%% set barcolor= to a color name defined by xcolor package
 \newcommand\@ColorName{black} % default
-\define at key{asmejour}{barcolor}[Red4]{%
+\define at key{asmejour}{barcolor}[Goldenrod3]{%
       \renewcommand\@ColorName{#1}
 }
 
-%%% set key [lineno] to obtain linenumbers.
-\define at key{asmejour}{lineno}[true]{%
-      \setboolean{lineno}{#1}
-}
+%% the key main= passes the choice of main language to babel
 
-%%% set key [balance] to activate final column balancing.
-\define at key{asmejour}{balance}[true]{%
-      \setboolean{balance}{#1}
+\newif\ifaj at mainset\aj at mainsetfalse
+\define at key{asmejour}{main}[english]{%
+	  \PassOptionsToPackage{main=#1,#1}{babel}% added #1 resolves conflicts between certain .ldf files under "main=".
+	  \aj at mainsettrue
+	  \ifthenelse{\equal{#1}{english}}{%
+			\PassOptionsToPackage{pdflang=en}{hyperref}}{%
+		  	\ClassWarningNoLine{asmejour}{Selecting #1 as the primary language}%
+	  }%
 }
 
-%%% set key [lang,lang-second,lang-third] to pass languages to babel.
-
-%% In case language options are dropped during editing, include this. Subsequent choice of lang= will override it.
-\PassOptionsToPackage{english}{babel}
-
-\define at key{asmejour}{lang}[english]{%
-      \PassOptionsToPackage{main=#1}{babel}%
+%% only main= is actually needed, but keeping these three legacy commands for backward compatibility
+\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}{%
+		  	\ClassWarningNoLine{asmeconf}{Selecting #1 as the primary language}%
+	  }%
 }
-\define at key{asmejour}{lang-second}[english]{%
+\define at key{asmejour}{lang-second}[english]{%  deprecated option
       \PassOptionsToPackage{#1}{babel}%
 }
-\define at key{asmejour}{lang-third}[english]{%
+\define at key{asmejour}{lang-third}[english]{%  deprecated option
       \PassOptionsToPackage{#1}{babel}%
 }
 
-%%% set key [nolists] to suppress lists of figures and tables
-\define at key{asmejour}{nolists}[false]{%
-      \setboolean{lists}{#1}
-}
+%% if main language was not chosen explicitly, default to English
+\ifaj at mainset\relax\else
+	\PassOptionsToPackage{main=english}{babel}%
+	\PassOptionsToPackage{pdflang=en}{hyperref}
+	%\ClassWarningNoLine{asmejour}{Selecting English as the primary language, since main= not set}%
+\fi
 
 \ProcessKeyvalOptions{asmejour}
 
+%% Turn off these keys now that we're done with them
+\def\@KeyFamily{asmejour}
+\NewDocumentCommand\aj at DisableOption{m}{%
+  \DisableKeyvalOption[%
+    action=ignore,%
+    class=asmejour%
+  ]{#1}{\@KeyFamily}%
+}
+\NewDocumentCommand\@DisableKeys{>{\SplitList{;}}m}{\ProcessList{#1}{\aj at DisableOption}}
+\@DisableKeys{nodefaultsups;mathalfa;barcolor;main;lang;lang-second;lang-third}
 
 
+%%%%%%%   PDF/A Compliance Options  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newif\ifaj at setpdfa\aj at setpdfafalse
+\newif\ifaj at pdfaone\aj at pdfaonefalse
+
 \ifpdftex %% PDF/A compliance has only been configured for pdflatex
 %
 %%% set key [pdfa] to activate pdf/a compliance (default is pdf/A-3u)
 	\define at key{pdfaopt}{pdf-a}[true]{%
-      \setboolean{setpdfa}{#1}%
+      \aj at setpdfatrue
       \PassOptionsToPackage{pdfa,pdfapart=3,pdfaconformance=u}{hyperref}%
 }
 %%% to select part 1, 2 or 3 
 	\define at key{pdfaopt}{pdfapart}[3]{%
       \PassOptionsToPackage{pdfapart=#1}{hyperref}%
-	  \ifthenelse{\equal{#1}{1}}{\setboolean{pdfaone}{true}}{\relax}%
+	  \ifthenelse{\equal{#1}{1}}{\aj at pdfaonetrue}{\relax}%
 }
 %% to select conformance b or u.  NB: a is not possible with pdfLaTeX, and u is not possible with 1.
 	\define at key{pdfaopt}{pdfaconformance}[u]{%
@@ -159,13 +172,28 @@
 }
 	\ProcessKeyvalOptions{pdfaopt}
 \else
-	\ClassWarningNoLine{asmejour}{PDF/A compliance option requires pdfLaTeX engine}%
+	\ifaj at pdfaone\ClassWarningNoLine{asmejour}{PDF/A compliance option requires pdfLaTeX engine}\fi%
 \fi
 
+%% Done with these keys, so we can now disable them
+\def\@KeyFamily{pdfaopt}
+\@DisableKeys{pdf-a;pdfapart;pdfaconformance}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%  Further class options   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% option to omit ASME footer
+%%% Option to obtain line numbers [lineno] 
+\newif\ifaj at lineno\aj at linenofalse
+\DeclareOption{lineno}{\aj at linenotrue}
+
+%%% Option to balance column height on last page [balance] 
+\newif\ifaj at balance\aj at balancefalse
+\DeclareOption{balance}{\aj at balancetrue}
+
+%% Option to omit lists of figures and tables
+\newif\ifaj at lists\aj at liststrue
+\DeclareOption{nolists}{\aj at listsfalse}
+
+%% Option to omit ASME footer
 \DeclareOption{nofoot}{%
    \AtBeginDocument{\pagestyle{plain}%
      \fancypagestyle{title}{%
@@ -174,8 +202,7 @@
      }
    }
 }
-
-%% option to omit ASME copyright
+%% Option to omit ASME copyright
 \DeclareOption{nocopyright}{%
    \AtBeginDocument{\fancypagestyle{title}{%
       \fancyhf{}
@@ -186,55 +213,78 @@
     }   
 }
 
-%% Access many options from newtxmath. See newtxmath documentation for details.
-\DeclareOption{upint,smallerops,varvw,varg,slantedGreek,frenchmath,varbb,cmbraces}{\PassOptionsToPackage{}{newtxmath}}
+%% Option for copyright notice if all authors are government employees [govt]
+\newif\ifaj at govt\aj at govtfalse
+\DeclareOption{govt}{\aj at govttrue}
 
-%% Option for slightly larger small capitals font [largesc] or to loosen word spacing [looser]
-\DeclareOption{largesc}{\PassOptionsToPackage{}{newtxtext}}
+%% Option for copyright notice if some (not all) authors are government employees [govtsome]
+\newif\ifaj at govtsome\aj at govtsomefalse
+\DeclareOption{govtsome}{\aj at govtsometrue}
 
+%% Option for government contractor copyright notice [contractor]
+\newif\ifaj at contractor\aj at contractorfalse
+\DeclareOption{contractor}{\aj at contractortrue}
+
+%% Option for slightly larger small capitals font [largesc], corrected 29 Jan 2021
+\DeclareOption{largesc}{\PassOptionsToPackage{largesc=true}{newtxtext}}% largesc is a boolean key in newtxtext
+
 %% ASME word separation is greater than newtxtext defaults so change these parameters.
-\PassOptionsToPackage{spacing=0.3em, stretch=0.18em, shrink=0.08em}{newtxtext}
+\PassOptionsToPackage{spacing=0.3em, stretch=0.18em, shrink=0.10em}{newtxtext}% increased shrink from 0.08, 30 Jan 21
 
 %% Option not to use latex default superscripts, instead using the newtxtext superiors font [nodefaultsups]
 \ifthenelse{\boolean{DefaultSups}}{\PassOptionsToPackage{defaultsups}{newtxtext}}{\relax}
 
+%% Disable newtxtext osf option, which is not appropriate for documents in this class
+\DeclareOption{osf}{%
+	\PassOptionsToPackage{lining}{newtxtext}%
+}
+
 %% Option to hyphenate the typewriter font [hyphenate]
 \DeclareOption{hyphenate}{%
 	\PassOptionsToPackage{hyphenate}{inconsolata}%
 	\ClassWarningNoLine{asmejour}{Allowing hyphenation of typewriter font}%
 }
+%% Option to enforce monospacing of words the typewriter font [mono]
+\DeclareOption{mono}{%
+	\PassOptionsToPackage{mono}{inconsolata}%
+}
+%% Option for unslashed zero typewriter font [var0].
+\DeclareOption{var0}{%
+	\PassOptionsToPackage{var0}{inconsolata}% var0 is a key via xkeyval in inconsolata
+}
 
-%%% Option to activate pdf/a-3u compliance [pdfa] (requires hyperxmp package)
-%\ifthenelse{\boolean{setpdfa}}{%
-%	\PassOptionsToPackage{pdfa,pdfapart=3,pdfaconformance=u}{hyperref}}{\relax}%
-
 %% Suppress warnings about mathalfa keys as unused global options
 \DeclareOption*{}
 
 \ProcessOptions \relax
 
-%%%%%%%%%%%%% end options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%  Page size, bibliography, graphics, color, etc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage[paperheight=285.7mm, paperwidth=215.900mm, left=21.100mm, right=21.100mm, top=15.9mm, bottom = 24mm, footskip=8mm]{geometry}
 \setlength\columnsep{4.5mm}
 \setlength\parindent{3.5mm}
-% ASME's pdf pages are 11.25 in. tall, not 11.00 in.
+%% ASME's pdf pages are 11.25 in. tall, not 11.00 in.
 
 \RequirePackage[sort&compress,numbers]{natbib} 
-\AtBeginDocument{\def\NAT at space{\relax}}  % ASME puts no space between numerical references (4/5/20)
-\setlength\bibsep{0pt plus 1pt minus 0pt} % ASME keeps this tight
+\AtBeginDocument{\def\NAT at space{\relax}}%   ASME puts no space between numerical references (4/5/20)
+\setlength\bibsep{0pt plus 1pt minus 0pt}%  ASME keeps this tight
 \renewcommand*{\bibfont}{\footnotesize}
 
 \RequirePackage{graphicx} 
-\RequirePackage[hyperref,fixpdftex,dvipsnames,svgnames,x11names]{xcolor}
-\RequirePackage{xparse} 
-\RequirePackage{metalogo,hologo} % Access various LaTeX logos if needed
+\ifpdf\def\MyColorOption{fixpdftex}\else\ifluatex\def\MyColorOption{luatex}\else\def\MyColorOption{}\fi\fi
+\RequirePackage[hyperref,\MyColorOption,dvipsnames,svgnames,x11names]{xcolor}
 
-%%%%%%%%%%%%%%%%  Table related   %%%%%%%%
+% Nice solution from DPC to prevent aux file errors when switching from pdflatex to lualatex
+\ifx\directlua\undefined
+	\AtBeginDocument{\immediate\write\@auxout{\detokenize{%
+	 \ifx\directlua\undefined\else\endinput\fi}}}
+\fi
 
+%%%%%%%%%%%%%  Table related   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \RequirePackage{array} 
 
-\RequirePackage{dcolumn} %% alignment on decimal places
+\RequirePackage{dcolumn}%  column alignment on decimal places
 \newcolumntype{d}[1]{D{.}{.}{#1}}
 
 %% make \hline in tables heavier than default 0.4pt
@@ -245,34 +295,35 @@
 \renewcommand*{\midrule}{\specialrule{0.5pt}{2pt}{3pt}}
 \renewcommand*{\bottomrule}{\specialrule{0.5pt}{1pt}{\doublerulesep}\specialrule{0.5pt}{0pt}{0pt}}
 
-%%%%%%%%  FONT related  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%  Font related   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\RequirePackage[T1]{fontenc}
-
 \ifpdftex
-	\ifthenelse{\boolean{pdfaone}}{
-		\pdfminorversion=4}{% for pdf/a-1 need version 4, not 7
-  		\pdfminorversion=7  % this selection is not really required.
-	}
-  \RequirePackage[utf8]{inputenc} % for backward compatibility with pre-2018 distributions
+	\ifaj at setpdfa
+		\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
-  \relax
+	\relax % will lose some accented characters this way... better to use fontspec... if the systems fonts exist...
 \fi
 
-\RequirePackage{mathtools} % extends amsmath
+\RequirePackage{mathtools}% loads and extends amsmath
 \RequirePackage[]{babel}
+
 \RequirePackage[]{newtxtext} 
-\RequirePackage[varl,varqu]{inconsolata} % sans typewriter font; restored varl, varqu 2020/08/10 
+\RequirePackage[varl,varqu]{inconsolata}% sans typewriter font; restored varl, varqu 2020/08/10 
 \RequirePackage[]{newtxmath}
 
 %% override \textsu if using default superiors
 \ifthenelse{\boolean{DefaultSups}}{\let\textsu\textsuperscript}{\relax}
   
-\RequirePackage[]{mathalfa} % load optional fonts for Calligraphy, Script, etc. 
+\RequirePackage[]{mathalfa}% load optional fonts for Calligraphy, Script, etc. 
 
-\RequirePackage{bm} % load after all math to give access to bold math
+\RequirePackage{bm}%  load after all math for expanded access to bold math
 
-%% In addition to the word spacing options declared in line 163...
+%% In addition to the word spacing options declared in line 235...
 %% Relative to size9.clo: leading reduced to 10 pt; displayskips made greater
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@ixpt{10\p@}%               % <== was \@xipt
@@ -283,47 +334,74 @@
    \let\@listi\@listI}
 \normalsize
 
-% The article class calls \sloppy in two-column mode (\tolerance 9999, \emergencystretch 3em)
-% These adjustments affect line breaking; the values below are intended to produce
-% fewer lines with large spaces, without creating the problems of using \fussy in two-column mode.
+%% The article class calls \sloppy in two-column mode (\tolerance 9999, \emergencystretch 3em)
+%% These adjustments affect line breaking; the values below are intended to produce
+%% fewer lines with large spaces, without creating the problems of using \fussy in two-column mode.
 \tolerance 2500
 \emergencystretch 3em 
 
+\setlength{\jot}{10pt}% <== default is 3pt
 
-\setlength{\jot}{10pt} %<== default is 3pt
+%% multline has an "extra line" above it, so subtract from \abovedisplayskip to remove imbalance
+\BeforeBeginEnvironment{multline}{\addtolength\abovedisplayskip{-7pt}}
+\AfterEndEnvironment{multline}{\addtolength\abovedisplayskip{+7pt}}
 
-\allowdisplaybreaks % ASME allows these breaks
+\allowdisplaybreaks   % ASME allows these breaks
 
 
 %% This provides sans serif italic and sans serif bold italic math.
-%% It's intended only for use in the figure and table captions.
+%% It's intended for use in the figure and table captions.
 %% Fonts are from newtxsf package.
 \DeclareMathVersion{sansbold}
-\SetMathAlphabet{\mathsf}{sansbold}{\encodingdefault}{\sfdefault}{b}{n}
 \SetSymbolFont{letters}{sansbold}{OML}{ntxsfmi}{b}{it}
 \SetSymbolFont{lettersA}{sansbold}{U}{ntxsfmia}{b}{it}
 \SetSymbolFont{symbols}{sansbold}{LMS}{ntxsy}{b}{n}
+\SetSymbolFont{largesymbols}{sansbold}{LMX}{ntxexx}{b}{n}%  added 26 Jan 2021
+\SetSymbolFont{largesymbolsTXA}{sansbold}{U}{ntxexa}{b}{n}% added 26 Jan 2021
 \SetSymbolFont{operators}{sansbold}{\encodingdefault}{\sfdefault}{\bfdefault}{n}
+\SetMathAlphabet{\mathsf}{sansbold}{\encodingdefault}{\sfdefault}{b}{n}% \mathsf is upright
 
-%% Text Gyre Heros Condensed is qhvc (regular is qhv). 
+%% These lines are to provide math accents for the sans and sansbold math versions.  
+%% The accents from ntxsfmi work normally with regular times fonts. Added 27 Jan 2021
+\DeclareSymbolFont{lettersAB}{U}{ntxsfmia}{m}{it}
+\SetSymbolFont{lettersAB}{normal}{U}{ntxsfmia}{m}{it}
+\SetSymbolFont{lettersAB}{bold}{U}{ntxsfmia}{b}{it}
+\SetSymbolFont{lettersAB}{sansbold}{U}{ntxsfmia}{b}{it}
+\DeclareFontSubstitution{U}{ntxsfmia}{m}{it}
+%
+\DeclareMathAccent{\grave}{\mathord}{lettersAB}{254}
+\DeclareMathAccent{\acute}{\mathord}{lettersAB}{255}
+\DeclareMathAccent{\check}{\mathord}{lettersAB}{186}
+\DeclareMathAccent{\breve}{\mathord}{lettersAB}{187}
+\DeclareMathAccent{\bar}{\mathord}{lettersAB}{221}
+\DeclareMathAccent{\mathring}{\mathord}{lettersAB}{222}
+\DeclareMathAccent{\hat}{\mathord}{lettersAB}{223}
+\DeclareMathAccent{\dot}{\mathord}{lettersAB}{224}
+\DeclareMathAccent{\tilde}{\mathord}{lettersAB}{219}
+
+%%% sans math version, potential value with PGFPlots, and provisionally called in subfigure captions.
+%%% this is experimental, still needs stress testing. 30/01/2021
+\DeclareMathVersion{sans}
+\SetSymbolFont{letters}{sans}{OML}{ntxsfmi}{m}{it}
+\SetSymbolFont{lettersA}{sans}{U}{ntxsfmia}{m}{it}
+\SetSymbolFont{lettersAB}{sans}{U}{ntxsfmia}{m}{it}
+\SetSymbolFont{symbols}{sans}{LMS}{ntxsy}{m}{n}
+\SetSymbolFont{largesymbols}{sans}{LMX}{ntxexx}{m}{n}
+\SetSymbolFont{largesymbolsTXA}{sans}{U}{ntxexa}{m}{n}
+\SetSymbolFont{operators}{sans}{\encodingdefault}{\sfdefault}{m}{n}
+\SetMathAlphabet{\mathsf}{sans}{\encodingdefault}{\sfdefault}{m}{n}
+
+%% TeX Gyre Heros Condensed is qhvc (regular is qhv). 
 \newcommand*{\CondSans}{\selectfont\fontfamily{qhvc}\selectfont} 
 \renewcommand\huge{\@setfontsize\huge{14}{14}}        %... for author names only
 \newcommand*{\CondSansBold}{\renewcommand\bfdefault{b}\selectfont\fontfamily{qhvc}\selectfont\bfseries} 
 \renewcommand\Huge{\@setfontsize\Huge{26.5}{26.5}}    %... for title font only
+  
+\RequirePackage{metalogo,hologo}% Access to various LaTeX logos (for use in the documentation)
 
-\addto{\captionsenglish}{%
-  \renewcommand{\figurename}{Fig.}  
-  \renewcommand{\tablename}{Table}  
-}
-  \providecommand{\nomname}{Nomenclature}  
-  \providecommand{\keywordname}{Keywords}
-  \providecommand{\appendicesname}{Appendices}
-  \providecommand{\CAwords}{Corresponding Author}
+%%%%%%%%%%%%%%%%%  Equation and Line Numbering  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%  EQUATION AND LINE NUMBERING  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 %% ASME puts equation tags in blue
-\RequirePackage{etoolbox} % dropped xpatch 28/02/20
 \patchcmd{\tagform@}{(\ignorespaces#1\unskip\@@italiccorr)}{\color{blue}(\ignorespaces#1\unskip\@@italiccorr)}{}{}
 
 %% Ensure that the current font is used for equation tags, not \normalfont as set by amsmath
@@ -331,47 +409,51 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ifthenelse{\boolean{lineno}}{%
-    \RequirePackage[switch,mathlines]{lineno}    
-    \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}} 
-    \AtBeginDocument{\linenumbers}
-    \ClassWarningNoLine{asmejour}{Package lineno loaded, so final column balancing is disabled}
-%%% 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{\losepostpenalty}{}{\patchcmd{\linenomathWithnumbers}{\advance\postdisplaypenalty\linenopenalty}{}{}{}}
+\ifaj at lineno
+    \RequirePackage[switch,mathlines]{lineno}%
+    \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}}% 
+    \AtBeginDocument{\linenumbers}%
+    \ifaj 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}%
+    }%
+%
+    \NewDocumentCommand{\aj at FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\aj at FixAMSMath}}%
+    \aj at FixAll{align;alignat;gather;flalign;multline}%
+%
+\else
+    \ProvideDocumentEnvironment{linenomath}{}{}{}%
+    \ifaj at balance                %    balancing through flushend can produce weird errors
+    	\RequirePackage{flushend}%    flushend package is NOT compatible with lineno
+    	\AtEndDocument{\flushcolsend}%
+		\ClassWarningNoLine{asmejour}{Calling flushend package to balance column height on last page}%
+    \fi%
+\fi
 
-\NewDocumentCommand{\FixAMSMath}{m}{%
-	\AtBeginEnvironment{#1}{\losepostpenalty\linenomath}%
-	\AtEndEnvironment{#1}{\endlinenomath}%
-	\AtBeginEnvironment{#1*}{\losepostpenalty\linenomath}%
-	\AtEndEnvironment{#1*}{\endlinenomath}%
-}
+\providecommand{\@LN at col}[1]{\relax}% avoid errors in the aux file when lineno is dropped
+\providecommand{\@LN}[2]{\relax}
 
-\NewDocumentCommand{\FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\FixAMSMath}}
-\FixAll{align;alignat;gather;flalign;multline}
-
-    }{%
-    \ProvideDocumentEnvironment{linenomath}{}{}{}
-    \ifthenelse{\boolean{balance}}{% balancing through flushend can produce weird errors
-    \RequirePackage{flushend}      % flushend package is NOT compatible with lineno
-    \AtEndDocument{\flushcolsend} 
-    }{\relax}
-}
-\providecommand{\@LN at col}[1]{\relax}
-\providecommand{\@LN}[2]{\relax}
 %% ASME page proofs seem to align the number at top of the line, rather than bottom as done here.
 
+%%%%%%%%%%%%%%%%%  Footer Set Up  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%  FOOTER SET UP  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%  footer text names  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%  footer text names  %%%%%%%%%%%%%%%
-
 \newcommand{\JourName}[1]{\gdef\@JourName{#1}}
 \providecommand\@JourName{\hbox{ }}
 
-\DeclareDocumentCommand{\PaperYear}{G{\the\year}}{%
+\NewDocumentCommand{\PaperYear}{m}{%
       \gdef\@PaperYear{#1}%
       }
 \providecommand\@PaperYear{\the\year}
@@ -384,8 +466,8 @@
 		\gdef\@PreprintStringL{#1}%
 		\gdef\@PreprintStringR{#1}%
 	}{%
-	\ifx R#2{\gdef\@PreprintStringR{#1}}\else\relax\fi
-	\ifx L#2{\gdef\@PreprintStringL{#1}}\else\relax\fi
+	\ifx R#2{\gdef\@PreprintStringR{#1}}\fi
+	\ifx L#2{\gdef\@PreprintStringL{#1}}\fi
 	}
 }
 
@@ -392,12 +474,12 @@
 \newcommand{\PaperNumber}[1]{\gdef\@PaperNumber{#1-}}
 \providecommand\@PaperNumber{\relax}
 
-%%%%%%
+%%%%%%  Fancyhdr  %%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{fancyhdr}
 \pagestyle{fancy}
 
-\fancyhf{} % clear all header and footer fields
+\fancyhf{}% clear all header and footer fields
 \renewcommand{\headrulewidth}{0pt} 
 \renewcommand{\footrulewidth}{0pt}
 \fancyfoot[RE]{\large\bfseries\sffamily Transactions of the ASME} 
@@ -405,19 +487,17 @@
 \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage}
 \fancyfoot[LE]{\large\sffamily {\bfseries \@PaperNumber\thepage\space\space/}\space\space\@PreprintStringL\ }
 
-
 \fancypagestyle{title}{%
-\fancyhf{} % clear all header and footer fields
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{0pt}
-\fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage} 
-\fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName} 
-\fancyfoot[CO]{\large\bfseries\sffamily Copyright \textcopyright\ \@PaperYear\ by ASME}
+    \fancyhf{}% clear all header and footer fields
+    \renewcommand{\headrulewidth}{0pt}
+    \renewcommand{\footrulewidth}{0pt}
+    \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage} 
+    \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName} 
+    \fancyfoot[CO]{\large\bfseries\sffamily Copyright \textcopyright\ \@PaperYear\ by ASME}
 }
 
+%%%%%% Footnotes %%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%% Footnotes %%%%%%%
-
 \RequirePackage{fnpos}
 \makeFNbottom
 \makeFNbelow
@@ -432,15 +512,15 @@
 
 %% reduce indentation of footnotes
 \renewcommand\@makefntext[1]{%
-  \noindent\makebox[4mm][r]{\@makefnmark}\hyphenpenalty=300\exhyphenpenalty=300 #1} %<== suppress hyphenation
+  \noindent\makebox[4mm][r]{\@makefnmark}\hyphenpenalty=300\exhyphenpenalty=300 #1}% <== suppress hyphenation
   
 %% Produces an unmarked footnote about the revision date. 
 %% This command is invoked by \date as part of \MakeTitlePage below.
 %% Text can be anything given as the argument to \date{..}.
-\NewDocumentCommand{\revfootnote}{m}{\begin{NoHyper}\gdef\@thefnmark{}\@footnotetext{#1}\end{NoHyper}} 
+\NewDocumentCommand{\revfootnote}{m}{\begin{NoHyper}\gdef\@thefnmark{}\@footnotetext{\hspace{-3pt}#1}\end{NoHyper}} 
 
-% Previous is modified to eliminate missing anchor warning from hyperref that following would cause
-%\def\revfootnote{\gdef\@thefnmark{}\@footnotetext}
+%% The above has been offset per style and modified to eliminate missing anchor warning from hyperref that following causes
+%%\def\revfootnote{\gdef\@thefnmark{}\@footnotetext}
 
 
 %% include a comma for sequential footnotes
@@ -455,29 +535,31 @@
     \fi%
 }
 
+%%%%%%%%%  Caption Related  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%  CAPTION RELATED  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\addto{\captionsenglish}{%
+  \renewcommand{\figurename}{Fig.}  
+  \renewcommand{\tablename}{Table}  
+}
 
 \RequirePackage[labelfont={sf,bf},hypcap=false]{caption}
 \RequirePackage[hypcap=false,list=true]{subcaption}
 
 \DeclareCaptionTextFormat{boldmath}{\mathversion{sansbold}#1}
+\DeclareCaptionTextFormat{sansmath}{\mathversion{sans}#1}% strictly speaking, this is unnecessary.
 
 \captionsetup[figure]{labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad}
 \captionsetup[table]{labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad,skip=0.5\baselineskip} 
 
-%% 4 April 2020. ASME only labels subfigures with a sans serif, italic (a), (b),... no caption text, no bold face.
-%% Could set labelfont={sf},textfont={sf}, and normal math version needed; but would need sans math... 
-
-\captionsetup[subfigure]{labelformat=simple} % default: =parens
+%% 30 January 2021. ASME only labels subfigures with a sans serif, italic (a), (b),... no caption text, no bold face.
+\captionsetup[subfigure]{labelfont={sf},textfont={sf},textformat=sansmath,labelformat=simple}% default: =parens
 \renewcommand\thesubfigure{(\textit{\alph{subfigure}})}
 
-\captionsetup[subtable]{labelformat=simple} 
+\captionsetup[subtable]{labelfont={sf},textfont={sf},textformat=sansmath,labelformat=simple} 
 \renewcommand\thesubtable{(\textit{\alph{subtable}})}
 
 
-%%%%%%%%%%%%  SECTION HEADINGS  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% wish to accommodate hyperref
+%%%%%%%%%%%%  Section Headings  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage[raggedright,indentafter]{titlesec}
 
@@ -494,8 +576,11 @@
 \titleformat{\paragraph}[runin]{\itshape}{\thesubsubsection}{0.5em}{}[.]
 \titlespacing{\paragraph}{\parindent}{14pt plus 3pt minus 2pt}{0.5em}
 
-%%  Special handling of the appendices            
-%%  Assumes that appendices are the last technical content in paper 
+%% Special handling of the appendices            
+%% Assumes that appendices are the last technical content in paper
+
+\providecommand{\appendicesname}{Appendices}
+ 
 \RenewDocumentCommand{\appendix}{}{%
     \pdfbookmark[1]{\appendicesname}{appendices}
     \setcounter{section}{0}
@@ -505,7 +590,7 @@
     \titleformat{\section}[block]{\mathversion{bold}\bfseries\large\raggedright}{\appendixname\ \thesection:}{0.5em}{}[\setcounter{equation}{0}]
 }
 
-% natbib's \bibsection controls section heading for References.
+%% natbib's \bibsection controls section heading for References.
 
 
 %%%%%%%%%%%%%%%%%  List environments  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -518,7 +603,7 @@
 
 %%%%%%%%%%%%%%%%%  Hyperref  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ifthenelse{\boolean{setpdfa}}{%
+\ifaj at setpdfa
 %
 	%%% to assist with unicode glyph mapping, following M. Sharpe's recommendation in newtx documentation.
 	\pdfgentounicode=1  							%% enable CMaps
@@ -538,8 +623,8 @@
       /Info (sRGB)
     >>
   ]
-}%
-}{\relax}
+}
+\fi
 
 \RequirePackage{hyperxmp} %% to fix transfer of metadata to Acrobat pdf 
 
@@ -564,11 +649,12 @@
 	pdfdisplaydoctitle=true%
 	]{hyperref}
 	
-\urlstyle{same} % don't switch to typewriter font
-
+\urlstyle{same}                % don't switch to typewriter font
 \RequirePackage{doi}           % supports nasty characters in some doi's
 \renewcommand{\doitext}{doi:~} % change the default, {doi:}, to this for ASME specification
+\RequirePackage{bookmark}	   % improves handling of pdf bookmarks
 
+%%%%%% Adjustments to accommodate hyperref bookmarks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Since \bm is useful in headings, this fix will reduce frequency with which
 %% alternate pdfstrings must be given in section command as \section[pdfstring]{texstring}
@@ -618,13 +704,18 @@
 }
 
 
-%%%%%%%%%%%%%  define Nomenclature environment  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%  Define some section and other names for special environments  %%%%%%%
 
-%% Nomenclature environment in ASME Journal Style
+\providecommand{\nomname}{Nomenclature}  
+\providecommand{\keywordname}{Keywords}
+\providecommand{\CAwords}{Corresponding Author.}
+
+%%%%%%%%%%%%%  Nomenclature Environment   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Nomenclature environment in ASME Journal Style.
 %% Run twice to get proper label width.
-%% Set first optional argument (a dimension) to override automatic label width (e.g., if one label is excessive)
+%% Set first optional argument (a dimension) to override automatic label width (e.g., if one label too wide)
 %% Second argument can be used to rename the section, e.g., to List of Symbols.
-%%
 
 \newlength\widest
 \newlength\@widest
@@ -632,17 +723,23 @@
 \newlength\savitemsep
 
 %% If the second argument of \entry is omitted, a bold section heading is produced, e.g. \entry{Greek Letters}
-\DeclareDocumentCommand{\entry}{m g}{%
- \IfNoValueTF{#2}{%
+\NewDocumentCommand{\entry}{m g}{%
+	\IfNoValueTF{#2}{%
+         \itemsep12\p@ plus 4\p@ minus 4\p@% \bigskip
+         \goodbreak\item[\bfseries#1\hfill]\itemsep3\p@ plus 1\p@ minus 1\p@\@itempenalty=1000%
+			 }{%
+         \item[\hfill#1${} = {}$]#2%
+		 \@itempenalty=-\@lowpenalty%
+         \setlength\itemsep\savitemsep%
+         \settowidth\@widest{#1${} = {}$}%
+         \ifdim\@widest>\widest \global\setlength\widest\@widest\fi%
+     }
+}
+
+%% A separate command command for nomenclature subheadings (xparse "g" argument used in \entry is deprecated)
+\NewDocumentCommand\EntryHeading{m}{%
              \itemsep12\p@ plus 4\p@ minus 4\p@% \bigskip
              \goodbreak\item[\bfseries#1\hfill]\itemsep3\p@ plus 1\p@ minus 1\p@\@itempenalty=1000%
-			 }{%
-             \item[\hfill#1${} = {}$]#2%
-			 \@itempenalty=-\@lowpenalty%
-             \setlength\itemsep\savitemsep%
-             \settowidth\@widest{#1${} = {}$}%
-             \ifdim\@widest>\widest \global\setlength\widest\@widest\fi%
-             }
 }
 
 \RequirePackage{totcount}
@@ -652,7 +749,7 @@
 \AtBeginDocument{\setlength{\nomenwidth}{\totvalue{savedlength}sp}}
 % value is the length in scaled points (sp)
 
-\DeclareDocumentEnvironment{nomenclature}{O{\nomenwidth} O{\nomname}}{%
+\NewDocumentEnvironment{nomenclature}{O{\nomenwidth} O{\nomname}}{%
        \setlength{\widest}{0em}
         \section*{#2}
         \raggedright
@@ -672,9 +769,10 @@
    \end{list}%
 } 
        
-%%%%%%%%%%%%%%%% List of figures and list of tables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%  List of figures and list of tables  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ifthenelse{\boolean{lists}}{% ASME requires these lists for production. 
+%% ASME requires these lists for production. 
+\ifaj at lists
     \AtEndDocument{%
 	    \clearpage
 		\twocolumn[%
@@ -683,26 +781,13 @@
 			\listoftables
 		\end{@twocolumnfalse} 
 		]%
-    }
-    }{%
+	}%
+\else
     \ClassWarningNoLine{asmejour}{Omitting lists of figures and tables}%
-}
+\fi
 
 %%%%%%%%%%%%%%%%  Author/Title/Abstract block  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\newcommand{\papertitle}[1]{\gdef\@papertitle{#1}}
-\providecommand\@papertitle{\hbox{ }}
-
-\newcommand{\PaperTitle}{%
-\par\vspace*{6mm}%
-\parbox{\linewidth}{\centering{\bfseries\Large%
-\MakeTextUppercase{\@papertitle}%
-\thispagestyle{title}\par}  %% <=== \par gets the font leading to stick.
-     }%
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%
-
 \RequirePackage{xcoffins}
 
 \NewCoffin{\authorblock}
@@ -713,7 +798,7 @@
 \NewCoffin{\firstrowauthorblock}
 \SetHorizontalCoffin\firstrowauthorblock{}
 
-\newlength{\coffinsep} %%% space between coffins
+\newlength{\coffinsep}%%% space between coffins
 \setlength{\coffinsep}{4.5mm}
 
 \newcounter{authorno}
@@ -724,7 +809,7 @@
 \newlength{\rulecofheight}
 \newlength{\Titleheight}
 
-\DeclareDocumentCommand\SetAuthorBlock{m m}{%
+\NewDocumentCommand\SetAuthorBlock{m m}{%
    \addtocounter{authorno}{1}%
    \SetVerticalCoffin{\authorblock}{48.2mm}{%
    \raggedleft\sffamily%
@@ -733,100 +818,95 @@
 }
 \ifnum\value{authorno}=1
     \JoinCoffins\firstrowauthorblock\authorblock
-     \setlength{\rulecofheight}{\CoffinTotalHeight\firstrowauthorblock} 
+    \setlength{\rulecofheight}{\CoffinTotalHeight\firstrowauthorblock} 
   \else
     \JoinCoffins\firstrowauthorblock[hc,b]\authorblock[hc,t](0pt,-\coffinsep)
-     \setlength{\rulecofheight}{\CoffinTotalHeight\firstrowauthorblock}
+    \setlength{\rulecofheight}{\CoffinTotalHeight\firstrowauthorblock}
 \fi     
 }
 
 
-\DeclareDocumentCommand\SetTitle{m}{%
+\NewDocumentCommand\SetTitle{m}{%
    \SetVerticalCoffin{\Title}{114mm}{%
-   \vspace*{0.5mm}% <== ASME doesn't align bar and text
-   \noindent\Huge\CondSansBold\raggedright%
-   #1%
-   \par
+   	  \vspace*{0.5mm}% <== ASME doesn't align bar and text
+   	  \noindent\Huge\CondSansBold\raggedright%
+   	  #1%
+   	  \par
    }
 }
 
 \providecommand{\@keywords}{\relax}
-\DeclareDocumentCommand{\keywords}{g}{%
- \IfNoValueTF{#1}{%
-             \relax}{%
-             \long\def\@keywords{\par\vskip\baselineskip\noindent{\keywordname:} #1}%
-             }
+\NewDocumentCommand{\keywords}{m}{% changed to remove g option, 30/01/21
+	\long\def\@keywords{\par\vskip\baselineskip\noindent{\keywordname:} #1}%
 }
 
-\DeclareDocumentCommand\SetAbstract{m}{%
+\NewDocumentCommand\@SetAbstract{+m}{% add + to enable blank lines, etc.  31/01/2021
    \SetVerticalCoffin{\Abstract}{114mm}{%
-   \noindent\itshape%
-   #1
-   \@keywords\par% 
-   \vspace*{4mm}% <== at bottom of abstract to extend rule
+      \noindent\itshape%
+      #1
+      \@keywords\par% 
+      \vspace*{4mm}% <== at bottom of abstract to extend rule
+    }
 }
-}
 
-\DeclareDocumentCommand{\ConstructAuthorBlock}{}{%
-\JoinCoffins\Title[l,b]\Abstract[l,t](0pt,-1.5\coffinsep)
-\setlength{\Titleheight}{\CoffinTotalHeight\Title}
-\ifdim\Titleheight>\rulecofheight
-  \setlength{\rulecofheight}{\Titleheight}
-\else
-  \addtolength{\rulecofheight}{7.0mm} 
-\fi
-\SetHorizontalCoffin \ruleblock {\color{\@ColorName}\rule{2.1mm}{\rulecofheight}}
-\JoinCoffins\firstrowauthorblock[vc,r]\ruleblock[vc,l](\coffinsep,0pt)
-\JoinCoffins\firstrowauthorblock[vc,r]\Title[vc,l](\coffinsep,0pt)
-\centerline{\TypesetCoffin\firstrowauthorblock} %% in this instance, \centerline is better than \centering
+\NewDocumentCommand{\@ConstructAuthorBlock}{}{%
+	\JoinCoffins\Title[l,b]\Abstract[l,t](0pt,-1.5\coffinsep)
+	\setlength{\Titleheight}{\CoffinTotalHeight\Title}
+	\ifdim\Titleheight>\rulecofheight
+	   \setlength{\rulecofheight}{\Titleheight}
+	\else
+	   \addtolength{\rulecofheight}{7.0mm} 
+	\fi
+    \SetHorizontalCoffin \ruleblock {\color{\@ColorName}\rule{2.1mm}{\rulecofheight}}
+    \JoinCoffins\firstrowauthorblock[vc,r]\ruleblock[vc,l](\coffinsep,0pt)
+    \JoinCoffins\firstrowauthorblock[vc,r]\Title[vc,l](\coffinsep,0pt)
+    \centerline{\TypesetCoffin\firstrowauthorblock} %% in this instance, \centerline is better than \centering
 }   
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Corresponding author gets footnote #1 and subsequent notes are 2, 3, ....
-%%% ASME apparently does not recognize joint first authors...so I have not coded that functionality
+%% Corresponding author gets footnote #1 and subsequent notes are 2, 3, ....
+%% ASME apparently does not recognize joint first authors...so I have not coded that functionality
 
-%%%% Flag for corresponding author (just one expected, although this code supports more than one)
-%%%% for more than one CA, if including email addresses in the footnote, place them in final the command
-\newif\ifCA\CAfalse
-\newcommand{\CAemail}[1]{\gdef\@CAemail{#1}}
+%% 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
 
-% Allow for NO email address to be given by omitting second argument
-% ASME prefers email to be in address block, not CA footnote, although code can support the latter.
-\DeclareDocumentCommand{\CorrespondingAuthor}{g}{%
-\global\CAtrue%
- \IfNoValueTF{#1}{%
-         \gdef\@CAsep{\relax}%
-         \gdef\@CAemail{\relax}%
-         }{%
-         \gdef\@CAsep{:\space}%
-         \gdef\@CAemail{#1}%
-         }%
-\def\@makefnmark{\hbox{\@textsuperscript{\sffamily\@thefnmark}}}%
-\footnotemark%
-\addtocounter{footnote}{-1} % in case of more than one CA
+%% ASME prefers email to be in address block, not CA footnote; removed option 30/01/21
+\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
 }
 
-
 %%%%%%%%%%
 
-\newlength{\@AbstractSep} %% <== separation of author/abstract coffin from main two-column text.
+\newlength{\@AbstractSep}%% <== separation of author/abstract coffin from main two-column text.
 \setlength{\@AbstractSep}{12.5mm}
 \NewDocumentCommand\AbstractSep{m}{\setlength{\@AbstractSep}{#1}}
 
-\DeclareDocumentCommand{\MakeTitlePage}{}{%
-\thispagestyle{title}%
-\twocolumn[
-  \begin{@twocolumnfalse}
-\ConstructAuthorBlock
-  \vspace*{\@AbstractSep} 
-  \end{@twocolumnfalse} 
-]
-\ifCA 
- \addtocounter{footnote}{1}
- \footnotetext{\CAwords\@CAsep \@CAemail}
-\fi
-\ifDate\revfootnote{\@Date} \else\relax \fi
+\NewDocumentCommand{\MakeTitlePage}{}{%
+    \thispagestyle{title}%
+    \twocolumn[
+      	\begin{@twocolumnfalse}
+    	\@ConstructAuthorBlock
+      	\vspace*{\@AbstractSep} 
+      	\end{@twocolumnfalse} 
+    ]
+    \ifaj at CA 
+    	\addtocounter{footnote}{1}
+    	\footnotetext{\CAwords\@CAsep \@CAemail}% includes legacy code, remove \@CA commands eventually
+    \fi
+    \ifaj at Date\revfootnote{\@Date}\else\relax\fi
+    \ifaj 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
+    \ifaj 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.}%
+    \fi
+    \ifaj at govtsome\revfootnote{This work was authored in part by a U.\ S.\ Government employee in the scope of his/her employment. ASME disclaims all interest in the U.\ S.\ Government's contribution.}%
+    \fi
 }
 
 %%%%%%%%%%
@@ -836,23 +916,23 @@
 \RenewDocumentCommand{\maketitle}{}{\MakeTitlePage}
 \RenewDocumentCommand{\title}{}{\SetTitle}
 
-\RenewDocumentEnvironment{abstract}{+b}{\gdef\tmp{\SetAbstract{#1}}\aftergroup\tmp}{} 
+\RenewDocumentEnvironment{abstract}{+b}{\gdef\tmp{\@SetAbstract{#1}}\aftergroup\tmp}{\ignorespaces} 
 %% Thanks to DPC for the suggestion of \gdef\tmp{...
 
 %% Put date as an unnumbered footnote at bottom of first column
-\newif\ifDate\Datetrue % If true, print a date.
+\newif\ifaj at Date\aj at Datetrue% If true, print a date.
 
 \ExplSyntaxOn
 \RenewDocumentCommand{\date}{m}
   {%
-    \tl_if_empty:nTF {#1}{\global\Datefalse}{\gdef\@Date{#1}}%
+    \tl_if_empty:nTF {#1}{\global\aj at Datefalse}{\gdef\@Date{#1}}%
   }
 \providecommand\@Date{\today}
 \ExplSyntaxOff
 
-\RenewDocumentCommand{\thanks}{m}{\relax} %% disabling this standard command, as it is inconsistent with the format
+\RenewDocumentCommand{\thanks}{m}{\relax}%% disabling this standard command, as it is inconsistent with this format
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \endinput
 %%



More information about the tex-live-commits mailing list.