asmejour (17aug19)

git-svn-id: svn://tug.org/texlive/trunk@51892 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 361 insertions, 286 deletions

diff --git a/Master/texmf-dist/doc/latex/asmejour/README.md b/Master/texmf-dist/doc/latex/asmejour/README.md
index 6509454920c..2a040e7a369 100644
--- a/Master/texmf-dist/doc/latex/asmejour/README.md
+++ b/Master/texmf-dist/doc/latex/asmejour/README.md
@@ -1,11 +1,11 @@
  
   #asmejour: A template for ASME journal papers#
  
-  Version 1.04 dated 2019/07/05.
+  Version 1.05 dated 2019/08/17.
 
   ####Overview####
   This class provides a template to format preprints submitted to ASME journals in the style that 
-  is being used in early 2019.
+  is being used in 2019.
   
   This work is not a publication of ASME itself.
 
@@ -27,17 +27,17 @@
   
   This template was designed to approach the following aims:
 
-- closely approximate ASME's fonts and layout
+- closely approximate ASME's fonts and layout, including author/title/abstract design
 
-- follow ASME's current citation formats
+- follow today's ASME format for citations
 
 - support hyperref package (hyperlinks for figures, tables, citations, and web)
 
-- support pdf bookmarks
+- support pdf bookmarks and metadata
 
 - use the features of the newtxtext and newtxmath font packages
 
-- support bold face, math, and footnotes in section headings
+- support bold face, math, citations, and footnotes in section headings 
 
 - provide automatic layout of author blocks for multiple addresses
 
@@ -56,6 +56,8 @@
  ---
  
  ####Change log####
+ 
+v1.05:  automate list of figures/tables with option to omit; replace balance package with flushend package and automate; revise skips in nomenclature; address conflicts of lineno package with other elements; option to hyphenate typewriter font; new options for footer text; adjust \\emergencystretch and \\tolerance; additional documentation and references
 
 v1.04:  edit documentation; add language support via babel
  
diff --git a/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib b/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib
index ccdff4ecf09..86a277c8080 100644
--- a/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib
+++ b/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib
@@ -1,54 +1,26 @@
-%% Revised 5 July 2019.
+%% Revised 17 August 2019.
 
-@online{fourierwiki,
-title = {Joseph Fourier---Wikip\'{e}dia{,} l'encyclop\'{e}die libre},
-year = {2019},
-author = {Wikipedia},
-url = {https://fr.wikipedia.org/wiki/Joseph_Fourier},
-urldate = {July 5, 2019},
-}
-%% Note ASME Journal discourage citations to Wikipedia.
-
-@online{amsmath,
-author = {{American Mathematical Society} and {LATEX3 Project}},
-title = {User's Guide for the amsmath Package },
-year = {2018},
-organization = {Comprehensive \TeX\ Archive Network},
-url = {https://ctan.org/tex-archive/macros/latex/required/amsmath/amsldoc.pdf},
-urldate = {July 5, 2019},
-version = {2.1},
-}
-
-@online{sharpe1,
-author = {Michael Sharpe},
-title = {New {TX} font package},
-year = {2018},
-organization = {Comprehensive \TeX\ Archive Network},
-url = {https://ctan.org/pkg/newtx},
-urldate = {April 27, 2019},
-version = {1.554},
-}
-
-@online{sharpe2,
-author = {Michael Sharpe},
-title = {The \textsf{mathalfa} package},
-year = {2018},
-organization = {Comprehensive \TeX\ Archive Network},
-url = {https://ctan.org/pkg/mathalfa},
-urldate = {April 27, 2019},
-version = {1.10},
+@article{DKE1969,
+  author  =	{D. K. Edwards},
+  title	  =	{Radiative Transfer Characteristics of Materials},
+  journal =	jht,
+  volume  =	91,
+  number  = 1,
+  pages   = {1--15},
+  month   = {February},
+  year	  =	{1969},
+  doi     = {10.1115/1.3580108},
 }
-
-
+	
 @article{toohey2007,
-author = {Kathleen S. Toohey and Nancy R. Sottos and Jennifer A. Lewis and Jeffrey S. Moore and Scott R. White}, 
-year = {2007}, 
-title  = {Self-healing Materials with Microvascular Networks},
-journal = {Nature Materials}, 
-volume = {6},
-number = {6662}, 
-pages  = {581--585},
-doi = {10.1038/nmat1934},
+  author  = {Kathleen S. Toohey and Nancy R. Sottos and Jennifer A. Lewis and Jeffrey S. Moore and Scott R. White}, 
+  year    = {2007}, 
+  title   = {Self-healing Materials with Microvascular Networks},
+  journal = {Nature Materials}, 
+  volume  = {6},
+  number  = {6662}, 
+  pages   = {581--585},
+  doi     = {10.1038/nmat1934},
 }
 
 @BOOK{gibson2008,
@@ -80,16 +52,16 @@ doi = {10.1038/nmat1934},
   venue = {New Orleans, LA},
   eventdate = {September 10--13},
 }
-% Note that venue and eventdate are specific to this .bst style
+% Note that venue and eventdate are specific to the asmejour.bst style
 
 @techreport{oligaria2011,
-author = {Oligaria, T. T. and Fredy, C. W. and Popullo, A. Z. and Tucker, M. A.}, 
-year = {2011}, 
-title = {Characterization of PKM Dynamics}, 
-type = {SAE Technical Paper},
-institution = {Society of Automotive Engineers},
-address = {Warrendale, PA},
-number = {No.\ 2011-02-8345, 07ATC-96},
+  author = {Oligaria, T. T. and Fredy, C. W. and Popullo, A. Z. and Tucker, M. A.}, 
+  year = {2011}, 
+  title = {Characterization of PKM Dynamics}, 
+  type = {SAE Technical Paper},
+  institution = {Society of Automotive Engineers},
+  address = {Warrendale, PA},
+  number = {No.\ 2011-02-8345, 07ATC-96},
 }
 
 @phdthesis{mollen2014,
@@ -102,13 +74,13 @@ number = {No.\ 2011-02-8345, 07ATC-96},
 % type = {Sc{D} Thesis}, could be added to change the type of thesis. See example below.
 
 @book{smith2014,
-author = {Smith, John}, 
-year = {2014},
-title = {A Dog's Life in Berlin},
-publisher = {Oxford University Press}, 
-address = {New York},
-doi = {10.1055/acprof.oso/97890.0394.000},
-note = {\doi{10.1055/acprof.oso/97890.0394.000}},
+  author = {Smith, John}, 
+  year = {2014},
+  title = {A Dog's Life in Berlin},
+  publisher = {Oxford University Press}, 
+  address = {New York},
+  doi = {10.1055/acprof.oso/97890.0394.000},
+  note = {\doi{10.1055/acprof.oso/97890.0394.000}},
 }
 %% An example to show a doi even though doi is linked.
 %% note = {\url{http://dx.doi.org/10.1055/acprof.oso/97890.0394.000}},
@@ -122,64 +94,188 @@ note = {\doi{10.1055/acprof.oso/97890.0394.000}},
        note = {updated April 4, 2019},
 }
 
-@article{DKE1969,
-	author	=	{D. K. Edwards},
-	title	=	{Radiative Transfer Characteristics of Materials},
-	journal =   jht,
-	volume  =	91,
-	number = 1,
-	pages   =   {1--15},
-	month   =  {February},
-	year	=	{1969},
-	doi     = {10.1115/1.3580108},
-	}
-	
-@book{EDM,
-	author = {D. K. Edwards and V. E. Denny and A. F. Mills},
-	title= {Transfer Processes},
-	publisher = {Hemisphere Publishing},
-	edition = {2nd},
-	year	  =	1979,
-	address   =	{Washington, DC},
+@online{sharpe1,
+  author = {Michael Sharpe},
+  title = {New {TX} font package},
+  year = {2018},
+  organization = {Comprehensive \TeX\ Archive Network},
+  url = {https://ctan.org/pkg/newtx},
+  urldate = {April 27, 2019},
+  version = {1.554},
 }
 
-@article{montijano2014,
-       title={Numerical methods with {\LuaLaTeX}},
-       author={Juan I. Montijano and Mario P{\'{e}}rez and Luis R{\'{a}}ndez and Juan Luis Varona},
-       year=2014,
-       volume=35,
-       month={January},
-       number=1,
-       pages={51--56},
-       journal={TUGboat},
-       url = {https://tug.org/TUGboat/tb35-1/tb109montijano.pdf},
+@article{Lienhard2019b,
+  title 	= "Exterior Shape Factors from Interior Shape Factors",
+  journal 	= jht,
+  year 		= "2019",
+  doi 		= "10.1115/1.4042912",
+  author 	= {Lienhard, V, John H.},
+  eid 		= {061301},
+  volume 	= {141},
+  number 	= {6},
 }
 
-@techreport{reynolds1958,
-AUTHOR = {W.~C.~Reynolds and W.~M.~Kays and S.~J.~Kline},
-TITLE = {Heat transfer in the incompressible turbulent boundary layer. {I}--constant wall temperature},
-type = {NASA Technical Memorandum No.\ },
-number = {12-1-58W},
-institution = {National Aeronautics and Space Administration},
-address = {Washington, DC},
-Month={December},
-year = {1958},
-URL = {https://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19980228020.pdf},
+@online{sharpe2,
+  author = {Michael Sharpe},
+  title = {The \textsf{mathalfa} package},
+  year = {2018},
+  organization = {Comprehensive \TeX\ Archive Network},
+  url = {https://ctan.org/pkg/mathalfa},
+  urldate = {April 27, 2019},
+  version = {1.10},
+}
+
+@online{GSL,
+	title  = {{GNU} Scientific Library},
+    URL    = {https://www.gnu.org/software/gsl/},
+    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},
+    year = 2017,
+    organization = {Free Software Foundation},
+    address = {Boston, MA},
+    urldate = {Dec. 12, 2018},
+    version = {2.4},
+    versiontype = {Release},
+}
+
+@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},
+  organization = {National Institute of Standards and Technology},
+  address = {Gaithersburg, MD},
+  url = {http://dlmf.nist.gov/},
+  urldate ={Dec.\ 22, 2018},
+}
+
+@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},
+}
+
+@online{bottcher,
+  author = {Stephan I. B{\"o}ttcher and Uwe L{\"u}ck},
+  title = {\textsf{lineno.sty}: A {\LaTeX} package to attach line numbers to paragraphs},
+  year = {2005},
+  organization = {Comprehensive \TeX\ Archive Network},
+  url = {https://www.ctan.org/pkg/lineno},
+  urldate = {August 17, 2019},
+  version = {4.41},
+}
+
+@online{oostrum,
+  author = {Piet van Oostrum},
+  title = {The \textsf{fancyhdr} and \textsf{extramarks} packages},
+  year = {2019},
+  organization = {Comprehensive \TeX\ Archive Network},
+  url = {https://www.ctan.org/pkg/lineno},
+  urldate = {August 17, 2019},
+  version = {3.10},
+}
+ 
+@online{amsmath,
+  author = {{American Mathematical Society} and {LATEX3 Project}},
+  title = {User's Guide for the amsmath Package },
+  year = {2018},
+  organization = {Comprehensive \TeX\ Archive Network},
+  url = {https://ctan.org/tex-archive/macros/latex/required/amsmath/amsldoc.pdf},
+  urldate = {July 5, 2019},
+  version = {2.1},
+}
+
+@article{Lienhard2019c,
+  title   = {Linearization of Nongray Radiation Exchange: The Internal Fractional Function Reconsidered},
+  journal = jht,
+  year   = "2019",
+  doi    = "10.1115/1.4042158",
+  author = {Lienhard, V, John H.},
+  eid    = {052701},
+  volume = {141},
+  number = {5},
+}
+
+@book{ww1927,
+       author={E. T. Whittaker and E. N. Watson},
+       title={A Course of Modern Analysis},
+       year={1920},
+       edition={3rd},
+       publisher={Cambridge University Press},
+       address={Cambridge, UK},
+       url = {https://archive.org/details/courseofmodernan00whit},
+}
+  
+@incollection{euler1740,
+        author={Leonard Euler},
+        title={De summis serierum reciprocarum}, 
+        booktitle={Commentarii academiae scientiarum Petropolitanae},
+        volume= 7,
+        year=1740,
+        pages = {123--134},
+        archive=arxiv,
+        eprint={math/0506415},
+        note={First communicated to Daniel Bernoulli in 1734 and read before the St.\ Petersburg Academy in December 1735},
+}
+
+@book{euler1748,
+        author={Leonard Euler},
+        title = {Introductio in analysin infinitorum},
+        year={1748},
+        volume=1,
+        publisher={Apud Marcum-Michaelem Bousquet \& Socios},
+        address={Lausannae},
 }
+% note={English translation by I.\ Bruce available here at \url{http://www.17centurymaths.com/contents/introductiontoanalysisvol1.htm}},
+
+@online{fourierwiki,
+  title  = {Joseph Fourier---Wikip\'{e}dia{,} l'encyclop\'{e}die libre},
+  year   = {2019},
+  author = {Wikipedia},
+  url    = {https://fr.wikipedia.org/wiki/Joseph_Fourier},
+  urldate= {July 5, 2019},
+}
+%% Note ASME Journal discourage citations to Wikipedia.
+
+@techreport{reynolds1958,
+  AUTHOR = {W.~C.~Reynolds and W.~M.~Kays and S.~J.~Kline},
+  TITLE = {Heat transfer in the incompressible turbulent boundary layer. {I}--constant wall temperature},
+  type = {NASA Technical Memorandum No.\ },
+  number = {12-1-58W},
+  institution = {National Aeronautics and Space Administration},
+  address = {Washington, DC},
+  Month={December},
+  year = {1958},
+  archive = hndl,
+  eprint = {2060/19980228020},
+}
+%% URL = {https://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19980228020.pdf},
+%% URL = {http://hdl.handle.net/2060/19980228020},
 
 @incollection{DKE70,
-	author    =	{Donald K. Edwards},
-	title = {Thermal Radiation Measurements},
+	author	  = {Donald K. Edwards},
+	title 	  = {Thermal Radiation Measurements},
 	editor    =	{Ernst R. G. Eckert and Richard J. Goldstein},
 	booktitle =	{Measurement Techniques in Heat Transfer}, 
 	chapter   = {9},
 	pages     = {353--396},
-	volume ={130},
-	series	={{AGARD}ograph},
-	month   =  {November},
+	volume    = {130},
+	series	  = {{AGARD}ograph},
+	month     = {November},
     publisher = {Advisory Group for Aerospace Research and Development of {NATO}, Technivision Services},
 	address   = {Slough, England},
-	year	 = {1970},
+	year	  = {1970},
 }
 %%	type = {...}, changes chapter to something else...
 %%  url = {..} can be added if it exists
@@ -187,26 +283,26 @@ URL = {https://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19980228020.pdf},
 %%  For Collections, series is intended to be used with volume, i.e., which volume of a collection.
 %%  Series (the title of the collection) will not appear if the volume number is empty
 
-@article{Lienhard2019b,
-  title = "Exterior Shape Factors from Interior Shape Factors",
-  journal = jht,
-  year = "2019",
-  doi = "10.1115/1.4042912",
-  author = {Lienhard, V, John H.},
-  eid = {061301},
-  volume = {141},
-  number = {6},
+
+@book{EDM,
+	author = {D. K. Edwards and V. E. Denny and A. F. Mills},
+	title= {Transfer Processes},
+	publisher = {Hemisphere Publishing},
+	edition = {2nd},
+	year	  =	1979,
+	address   =	{Washington, DC},
 }
 
-@article{Lienhard2019c,
-  title = {Linearization of Nongray Radiation Exchange: The Internal Fractional Function Reconsidered},
-  journal = jht,
-  year = "2019",
-  doi = "10.1115/1.4042158",
-  author = {Lienhard, V, John H.},
-  eid = {052701},
-  volume = {141},
-  number = {5},
+@article{montijano2014,
+       title={Numerical methods with {\LuaLaTeX}},
+       author={Juan I. Montijano and Mario P{\'{e}}rez and Luis R{\'{a}}ndez and Juan Luis Varona},
+       year=2014,
+       volume=35,
+       month={January},
+       number=1,
+       pages={51--56},
+       journal={TUGboat},
+       url = {https://tug.org/TUGboat/tb35-1/tb109montijano.pdf},
 }
 
 @conference{Swaminathan2017IDABRO,
@@ -233,37 +329,6 @@ URL = {https://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19980228020.pdf},
   year = {2015},
   month = {sep},
 }
-
-@online{GSL,
-	title    =	{{GNU} Scientific Library},
-    URL = {https://www.gnu.org/software/gsl/},
-   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},
-   year = 2017,
-   organization = {Free Software Foundation},
-   address = {Boston, MA},
-   urldate = {Dec. 12, 2018},
-   version = {2.4},
-   versiontype = {Release},
-}
-
-@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},
-  organization = {National Institute of Standards and Technology},
-  address = {Gaithersburg, MD},
-  url = {http://dlmf.nist.gov/},
-  urldate ={Dec.\ 22, 2018},
-}
     
 @online{mpl,
 	title={mpl colormaps},
@@ -276,32 +341,20 @@ URL = {https://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19980228020.pdf},
 	month = {September},
 }
 
-
 @book{ahtt,   
-author    = {Lienhard, IV, John H. and Lienhard, V, John H.},    
-title     = {A Heat Transfer Textbook},   
-publisher = {Phlogiston Press},   
-year      = 2018,   
-volume    = {},  
-series    = {},   
-address   = {Cambridge, MA},   
-edition   = {4th},   
-month     = {},   
-version   = {2.12}, 
-url  = {http://ahtt.mit.edu},  
- } 
+  author    = {Lienhard, IV, John H. and Lienhard, V, John H.},    
+  title     = {A Heat Transfer Textbook},   
+  publisher = {Phlogiston Press},   
+  year      = 2019,   
+  volume    = {},  
+  series    = {},   
+  address   = {Cambridge, MA},   
+  edition   = {5th},   
+  month     = aug,   
+  version   = {5.00}, 
+  url  = {http://ahtt.mit.edu},  
+} 
  
-@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},
-}
- 
-
 @misc{narayan2017,
   author = {Prakash Narayan Govindan and Steven Lam and Maximus G. {St. John}},
   title = {Systems including a condensing apparatus such as a bubble column condenser}, 
@@ -318,12 +371,12 @@ url  = {http://ahtt.mit.edu},
 }
 
 @mastersthesis{smith1996,
-author = {Robert Smith},
-title = {Cylindrical Surfaces Involved in a Steady Motion},
-type = {{BS} Thesis},
-school = {Rochester Institute of Technology},
-address = {Rochester, NY},
-year = {1996},
+  author = {Robert Smith},
+  title = {Cylindrical Surfaces Involved in a Steady Motion},
+  type = {{BS} Thesis},
+  school = {Rochester Institute of Technology},
+  address = {Rochester, NY},
+  year = {1996},
 }
  
 @BOOK{johnson1980,
@@ -347,38 +400,6 @@ year = {1996},
   note         = {Optional note},
 }
 %  series       = {Series A},
-
-@book{ww1927,
-       author={E. T. Whittaker and E. N. Watson},
-       title={A Course of Modern Analysis},
-       year={1920},
-       edition={3rd},
-       publisher={Cambridge University Press},
-       address={Cambridge, UK},
-       url = {https://archive.org/details/courseofmodernan00whit},
-}
-  
-@incollection{euler1740,
-        author={Leonard Euler},
-        title={De summis serierum reciprocarum}, 
-        booktitle={Commentarii academiae scientiarum Petropolitanae},
-        volume= 7,
-        year=1740,
-        pages = {123--134},
-        archive=arxiv,
-        eprint={math/0506415},
-        note={First communicated to Daniel Bernoulli in 1734 and read before the St.\ Petersburg Academy in December 1735},
-}
-
-@book{euler1748,
-        author={Leonard Euler},
-        title = {Introductio in analysin infinitorum},
-        year={1748},
-        volume=1,
-        publisher={Apud Marcum-Michaelem Bousquet \& Socios},
-        address={Lausannae},
-}
-% note={English translation by I.\ Bruce available here at \url{http://www.17centurymaths.com/contents/introductiontoanalysisvol1.htm}},
   
 @BOOK{kirk2288a,
   title = {Decline and Fall of the Romulan Empire},
diff --git a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf
index 8f3f534f0a4..6c15c7effbf 100644
--- a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf
+++ b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf
diff --git a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
index 724e8fd680a..fb4dad7fba9 100644
--- a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
+++ b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
@@ -2,9 +2,9 @@
 
 %% 
 %%  This file is asmejour-template.tex, a template to format papers in the style of ASME journal papers 
-%%  as they are being published in early 2019.
+%%  as they are being published in 2019.
 %%
-%%  This file is version 1.04 dated 2019/07/05
+%%  This file is version 1.05 dated 2019/08/17
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -17,7 +17,7 @@
 %%          *    where colorname is any name def'd by xcolor package; omit barcolor option to get black
 %%
 %%          * Option to include line numbers [lineno]. The lineno package does not number equation 
-%%          *    lines, captions, etc. You must run twice for proper placement. 
+%%          *    lines, captions, etc. You must run twice for proper placement of the line numbers. 
 %%          *    This option will disable balancing column height on final page.
 %%
 %%          * Math options from M. Sharpe's newtxmath package: upright integrals [upint]; and
@@ -33,11 +33,16 @@
 %%          * 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 optional to use newtxtext's superiors font for footnotes [nodefaultsups] and an option
+%%          * An option to use newtxtext's superiors font for footnotes [nodefaultsups] and an option
 %%          *    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].  The primary language must be given last.
+%%          *    languages, [lang-second] and [lang-third].  The primary language must be the last option given.
+%%
+%%          * Option to omit the list of figures and list of tables [nolists]
+%%
+%%          * Option to allow hyphenation of the typewriter font [hyphenate]
+%%          *    Hyphenation is normally suppressed for typewriter mode because it is often used for code.
 %%
 %%  For details of newtxmath and mathalfa, refer to their documentation (available on CTAN: http://ctan.org).
 %%
@@ -71,7 +76,9 @@
 
 
 %% Class options are described above.
-\documentclass[largesc,upint,varvw,barcolor=Red4,nocopyright,lang-second=french,lang=english]{asmejour}
+\documentclass[largesc,upint,varvw,barcolor=Red4,nocopyright,hyphenate,lang-second=french,lang=english]{asmejour}
+
+\pdfminorversion=7 % This selection is not required.
 
 
 %%%%%  FIELDS TO BE COMPLETED FOLLOW  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,7 +87,7 @@
 %%%%%  pdf metadata, the user should edit %%%%%%%%%%%%%%%%%%
 \hypersetup{%
 	pdftitle={ASME Journal Paper Template},                % <=== change to YOUR pdf file title
-	pdfkeywords={ASME, Paper, Template, LaTeX, BibTeX},    % <=== change to YOUR pdf keywords
+	pdfkeywords={ASME, Paper, Template, LaTeX, BibTeX, asmejour class},    % <=== change to YOUR pdf keywords
 	pdfauthor={John H. Lienhard},                          % <=== change to YOUR name[s]!!!
 }
 
@@ -91,11 +98,11 @@
 %% If Journal Name is quite long, use \\ to insert a line break
 \JourName{Heat Transfer} %<=== change to name of your journal
 
-\PaperYear % defaults to current year if no argument or omitted; 
+\PaperYear % defaults to current year if no argument given or if command is omitted; 
            % \PaperYear{} omits year; \PaperYear{2018} sets 2018.
-
-
-%%%%%%%%%  End of Preamable  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+           
+           
+%%%%%%%%%  End of Preamble  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{document}
 
@@ -160,7 +167,7 @@ To begin, fill in the fields to be completed at top of the \texttt{asmejour-temp
 
 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 \verb|\CorrespondingAuthor| by placing the command at the end of the name.  
 
-The title should be placed into \verb|\SetTitle{..}|, and line breaks may be included 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|\SetAbstract{..}|. The abstract will automatically be italized. 
+The title should be placed into \verb|\SetTitle{..}|, and line breaks may be included 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|\SetAbstract{..}|. The abstract will automatically be italicized. 
 
 After setting up the authors, title, and abstract, issue the \verb|\MakeTitlePage| command. 
 
@@ -307,7 +314,8 @@ Elementary support for \texttt{eprint} numbers is also included, generating a ur
 
 \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. 
 
-\subsection{Version Number\footnote{Another longer footnote to show the leading and line breaking, and how it will sit at the bottom of a column. Another longer footnote to show the leading and line breaking, and how it will sit at the bottom of a column.}} 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 \cite{sharpe1,sharpe2},  but different wording may be selected using the \verb|versiontype={..}| field, to have ``Revision''  or something similar, as in \cite{GSL}. ASME often puts the version in the title, as in \cite{dlmf, texshop}, so I've left the final decision for discussion between the authors and the copy editor.
+\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 \cite{sharpe1,sharpe2},  but different wording may be selected using the \verb|versiontype={..}| field, to have ``Revision''  or something similar, as in \cite{GSL}. ASME often puts the version in the title, as in \cite{dlmf, texshop}, so I've left the final decision for discussion between the authors and the copy editor.
 
 
 %%%%%%%%%%%%%%% begin more complicated table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -333,13 +341,18 @@ Our competitor's data                      &  72.321   &  141.384 \\[1pt]
 %%%%%%%%%%%%%%%%%  begin two column figure  %%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{figure*}[t]
-\begin{minipage}[c]{0.5\textwidth}
+\begin{minipage}[t]{0.497\textwidth}
+\vbox{
+\vspace*{1.7em}
 \centering{
   \includegraphics{sample-figure-2a.pdf}
+}
+\vspace*{1.7em}
+}
 \subcaption{Interior region\label{fig:interior-region}}
-}\end{minipage}
+\end{minipage}
 %%%%%%%% don't leave a break here
-\begin{minipage}[c]{0.5\textwidth}
+\begin{minipage}[t]{0.497\textwidth}
 \centering{
 \includegraphics{sample-figure-2b.pdf}
 \subcaption{Exterior region\label{fig:exterior-region}}
@@ -354,9 +367,12 @@ Our competitor's data                      &  72.321   &  141.384 \\[1pt]
 \section{Additional Options for \texttt{asmejour.cls}}
 The class accepts a number of options in addition to those already described.
 
-\subsection{Line Numbers} The option \texttt{[lineno]} invokes the the \texttt{lineno} package.  This will produce line numbers in the margins. You must run \LaTeX\ twice for proper placement. The \texttt{lineno} package is not compatible with the \texttt{balance} package that makes final short columns the same height. Balancing will be disabled when this option is called. See the documentation of the \texttt{lineno} package for further commands to control line numbering.
+\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. 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.
+
+\subsection{Changing the Footer Text} 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{..}|.
 
-\subsection{Changing the Footer Text} 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 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. 
 
 \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.
 
@@ -383,7 +399,7 @@ q_\textrm{gray}  & q_\textrm{int, $T_1$} & q_\textrm{int, $T_m$} & q_\textrm{exa
 %%%%%%%%%%%%%%%%%%%%  end linewidth 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.
 %%
@@ -497,7 +513,7 @@ Acknowledge individuals, institutions, or companies that supported the authors i
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \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 some code exists for setting equations to span two columns, such code has performed fairly erratically with this package.
+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}}
@@ -538,10 +554,6 @@ Joseph Fourier est connu pour avoir déterminé, par le calcul, la diffusion de
 
 %%%%%%%%%%%%%  BIBLIOGRAPHY  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\balance %<=== this command, from the balance package, attempts to balance column heights on last page.
-         %     performance is a bit variable, however...
-         % The [lineno] option will disable this command
-
 \nocite{*} %% <=== delete this line - unless you wish to typeset the entire contents of your .bib file.
 
 \bibliographystyle{asmejour}   %% .bst file that follows ASME journal format. Do not change.
@@ -549,17 +561,9 @@ Joseph Fourier est connu pour avoir déterminé, par le calcul, la diffusion de
 \bibliography{asmejour-sample} %% <=== change this to name of your bib file
 
 
-%%%%%%%%%%%%%%% LIST OF FIGURES and LIST OF TABLES   %%%%%%%%%%%%%%%%
-\clearpage
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% ASME requires these lists for production. 
-\twocolumn[
-  \begin{@twocolumnfalse}
-\listoffigures
-\listoftables
-  \end{@twocolumnfalse} 
-]
+%% To omit final list of figures and tables, use the class option [nolists]
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \end{document}
  
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/asmejour/sample-figure-2a.pdf b/Master/texmf-dist/doc/latex/asmejour/sample-figure-2a.pdf
index e02f4c93f8a..e1b735b036e 100644
--- a/Master/texmf-dist/doc/latex/asmejour/sample-figure-2a.pdf
+++ b/Master/texmf-dist/doc/latex/asmejour/sample-figure-2a.pdf
diff --git a/Master/texmf-dist/doc/latex/asmejour/sample-figure-2b.pdf b/Master/texmf-dist/doc/latex/asmejour/sample-figure-2b.pdf
index 94dad8d4f63..e71d416a0b3 100644
--- a/Master/texmf-dist/doc/latex/asmejour/sample-figure-2b.pdf
+++ b/Master/texmf-dist/doc/latex/asmejour/sample-figure-2b.pdf
diff --git a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
index ba356403733..72087ac48de 100644
--- a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
+++ b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
@@ -6,7 +6,7 @@
 %%  The asmejour.cls file should be used with the files asmejour.bst (for citations) and asmejour-template.tex.
 %%
 %%
-%%  This file is version 1.04 dated 2019/07/05.
+%%  This file is version 1.05 dated 2019/08/17.
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -20,7 +20,7 @@
 %%  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.
 %%
-%%  Options for the class are described on lines 63-145. 
+%%  Options for the class are described on lines 63-157. 
 %%
 %%  The class defines an environment for nomenclature. LaTeX must be run twice to align those columns.
 %% 
@@ -52,7 +52,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{asmejour}[2019/07/05 asmejour paper format]
+\ProvidesClass{asmejour}[2019/08/17 asmejour paper format]
 
 \LoadClass[twoside,9pt,twocolumn]{extarticle}
 
@@ -66,6 +66,9 @@
 \newboolean{lineno}
 \setboolean{lineno}{false}
 
+\newboolean{lists}
+\setboolean{lists}{true}
+
 \RequirePackage{kvoptions}
 \RequirePackage{kvsetkeys}
 \SetupKeyvalOptions{
@@ -106,6 +109,11 @@
       \PassOptionsToPackage{#1}{babel}%
 }
 
+%%% set key [nolists] to suppress lists of figures and tables
+\define@key{asmejour}{nolists}[false]{%
+      \setboolean{lists}{#1}
+}
+
 \ProcessKeyvalOptions*
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -124,14 +132,13 @@
 \DeclareOption{nocopyright}{%
    \AtBeginDocument{\fancypagestyle{title}{%
       \fancyhf{}
-      \fancyfoot[RO]{\large\sffamily \@PreprintString\ \bfseries / \@PaperNumber\thepage} 
+      \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage} 
       \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName} 
       \fancyfoot[CO]{}
       }
     }   
 }
 
-
 %% Access many options from newtxmath. See newtxmath documentation for details.
 \DeclareOption{upint,smallerops,varvw,varg,slantedGreek,frenchmath,varbb,cmbraces}{\PassOptionsToPackage{}{newtxmath}}
 
@@ -144,15 +151,20 @@
 %% Option not to use latex default superscripts, instead using the newtxtext superiors font [nodefaultsups]
 \ifthenelse{\boolean{DefaultSups}}{\PassOptionsToPackage{defaultsups}{newtxtext}}{\relax}
 
+%% Option to hyphenate the typewriter font [hyphenate]
+\DeclareOption{hyphenate}{%
+	\PassOptionsToPackage{hyphenate}{inconsolata}%
+	\ClassWarningNoLine{asmejour}{Allowing hyphenation of typewriter font}%
+}
+
 %% Suppress warnings about mathalfa keys as unused global options
 \DeclareOption*{}
 
 \ProcessOptions \relax
 
-
 %%%%%%%%%%%%% end options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\RequirePackage[paperheight=285.7mm, paperwidth=215.9mm, left=21.1mm, right=21.1mm, top=15.9mm, bottom = 24mm, footskip=8mm]{geometry}
+\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.
@@ -193,18 +205,26 @@
 %% In addition to the word spacing options declared in line 121...
 %% Relative to size9.clo: leading reduced to 10 pt; displayskips made greater
 \renewcommand\normalsize{%
-   \@setfontsize\normalsize\@ixpt{10\p@}               % <== was \@xipt
-   \abovedisplayskip 10\p@ \@plus5\p@ \@minus4\p@      % <== was 8\p@ 4,4...
-   \abovedisplayshortskip 3\p@ \@plus1\p@ \@minus1\p@  % <== was \z@ \@plus3\p@ (3pt stretch)
-   \belowdisplayshortskip 10\p@ \@plus5\p@ \@minus4\p@ % <== was 5\p@ 3, 3
-   \belowdisplayskip \abovedisplayskip
+   \@setfontsize\normalsize\@ixpt{10\p@}%               % <== was \@xipt
+   \abovedisplayskip 10\p@ \@plus5\p@ \@minus4\p@%      % <== was 8\p@ 4,4...
+   \abovedisplayshortskip 3\p@ \@plus1\p@ \@minus1\p@%  % <== was \z@ \@plus3\p@ (3pt stretch)
+   \belowdisplayshortskip 10\p@ \@plus5\p@ \@minus4\p@% % <== was 5\p@ 3, 3
+   \belowdisplayskip \abovedisplayskip%
    \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.
+\tolerance 2500
+\emergencystretch 3em 
+
+
 \setlength{\jot}{10pt} %<== default is 3pt
 
 \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.
 %% Fonts are from newtxsf package.
@@ -229,21 +249,20 @@
   \providecommand{\keywordname}{Keywords}
 
 
-
 %%%%%%%%%%%%%%%%%  LINE AND EQUATION NUMBERING  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \ifthenelse{\boolean{lineno}}{%
     \RequirePackage[switch]{lineno}    
     \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}} 
     \AtBeginDocument{\linenumbers}
-    \ClassWarningNoLine{asmejour}{Package lineno loaded, so \protect\balance\space will be disabled}
+    \ClassWarningNoLine{asmejour}{Package lineno loaded, so final column balancing is disabled}
     }{%
-    \RequirePackage{balance}% balance is NOT compatible with lineno
+    \RequirePackage{flushend}     % flushend package is NOT compatible with lineno
+    \AtEndDocument{\flushcolsend} 
 }
 \providecommand{\@LN@col}[1]{\relax}
 \providecommand{\@LN}[2]{\relax}
-\providecommand{\balance}{\relax}% balance is NOT compatible with lineno
-%% ASME page proofs seem to align these at top of baseline, rather than bottom as done here.
+%% ASME page proofs seem to align the number at top of the line, rather than bottom as done here.
 
 
 %% ASME puts equation tags in blue
@@ -263,8 +282,18 @@
       }
 \providecommand\@PaperYear{\the\year}
 
-\def\@PreprintString{PREPRINT FOR REVIEW}
-\newcommand{\PreprintString}[1]{\gdef\@PreprintString{#1}}
+\def\@PreprintStringL{PREPRINT FOR REVIEW}
+\def\@PreprintStringR{PREPRINT FOR REVIEW}
+
+\NewDocumentCommand{\PreprintString}{m o}{%
+    \IfNoValueTF{#2}{%
+		\gdef\@PreprintStringL{#1}%
+		\gdef\@PreprintStringR{#1}%
+	}{%
+	\ifx R#2{\gdef\@PreprintStringR{#1}}\else\relax\fi
+	\ifx L#2{\gdef\@PreprintStringL{#1}}\else\relax\fi
+	}
+}
 
 \newcommand{\PaperNumber}[1]{\gdef\@PaperNumber{#1-}}
 \providecommand\@PaperNumber{\relax}
@@ -279,19 +308,20 @@
 \renewcommand{\footrulewidth}{0pt}
 \fancyfoot[RE]{\large\bfseries\sffamily Transactions of the ASME} 
 \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName} 
-\fancyfoot[RO]{\large\sffamily \@PreprintString\ \bfseries / \@PaperNumber\thepage}
-\fancyfoot[LE]{\large\sffamily {\bfseries \@PaperNumber\thepage\ /} \@PreprintString\ }
+\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 \@PreprintString\ \bfseries / \thepage} 
+\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 %%%%%%%
 
 \RequirePackage{fnpos}
@@ -363,7 +393,7 @@
 \setlist[enumerate,1]{label = (\arabic*), ref = (\arabic*),labelindent=3mm, leftmargin=*,noitemsep}
 %% have no examples of sublists...
 
-%%%%%%%%%%%%%  hyperref  %%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%  Hyperref  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{hyperxmp} %% to fix transfer of metadata to Acrobat pdf 
 
@@ -443,14 +473,16 @@
 \newlength\widest
 \newlength\@widest
 \newlength\nomenwidth
+\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}{%
-             \bigskip
-             \item[\bfseries#1\hfill]\hphantom{x}\par\smallskip%  % ASME is probably closer to \medskip here
+             \itemsep12\p@ plus 4\p@ minus 4\p@% \bigskip
+             \goodbreak\item[\bfseries#1\hfill]\itemsep3\p@ plus 1\p@ minus 1\p@\nopagebreak% \smallskip, ASME closer to \medskip
              }{%
              \item[\hfill#1${} = {}$]#2%
+             \setlength\itemsep\savitemsep
              \settowidth\@widest{#1${} = {}$}%
              \ifdim\@widest>\widest \global\setlength\widest\@widest\fi%
              }
@@ -464,7 +496,7 @@
 % value is the length in scaled points (sp)
 
 \DeclareDocumentEnvironment{nomenclature}{O{\nomenwidth} O{\nomname}}{%
-        \setlength{\widest}{0em}
+       \setlength{\widest}{0em}
         \section*{#2}
         \raggedright
         \begin{list}{}{%
@@ -476,12 +508,28 @@
              \setlength{\labelwidth}{#1}
              \setlength{\leftmargin}{\labelwidth}
              \addtolength{\leftmargin}{\labelsep}
-        }%
+			 \setlength\savitemsep\itemsep
+         }%
    }{%
    \setcounter{savedlength}{\widest}%
    \end{list}%
 } 
        
+%%%%%%%%%%%%%%%% List of figures and list of tables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\ifthenelse{\boolean{lists}}{% ASME requires these lists for production. 
+    \AtEndDocument{%
+	    \clearpage
+		\twocolumn[%
+		\begin{@twocolumnfalse}
+			\listoffigures
+			\listoftables
+		\end{@twocolumnfalse} 
+		]%
+    }
+    }{%
+    \ClassWarningNoLine{asmejour}{Omitting lists of figures and tables}%
+}
 
 %%%%%%%%%%%%%%%%  Author/Title/Abstract block  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%