asmeconf (9nov20)

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

5 files changed, 127 insertions, 95 deletions

diff --git a/Master/texmf-dist/doc/latex/asmeconf/README.md b/Master/texmf-dist/doc/latex/asmeconf/README.md
index b6155a016fe..9b612624c5b 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/README.md
+++ b/Master/texmf-dist/doc/latex/asmeconf/README.md
@@ -1,7 +1,7 @@
  
   #asmeconf: A template for ASME conference papers#
  
-  Version 1.19 dated 2020/08/12.
+  Version 1.20 dated 2020/11/08.
 
   ####Overview####
   This class provides a template to format ASME Conference papers according to
@@ -24,7 +24,7 @@
           sample-figure-2a.pdf, 
           sample-figure-2b.pdf   -- figures for the example
           *
-          author-grid-style.pdf  -- example of title page with "oldauthors" option
+          author-grid-style.pdf  -- example of title page with "authorgrid" option
 
   The .tex and .cls files are commented and should be self-explanatory.
 
@@ -55,6 +55,8 @@
 
 - support PDF/A (archival) standards if desired
 
+- support copyright footer for federal employees and contractors
+
 
   ####Author####
   
@@ -71,6 +73,8 @@
  
  ####Change log####
 
+ v1.20 (2020/11/08): Add options to change copyright notice for federal employees and contractors; rename option "oldauthors" as "authorgrid"; other minor edits. Thanks to Bret Van Poppel for suggesting the federal copyright.
+ 
  v1.19 (2020/08/12): Add support for PDF/A archival standards (1b, 2b, 2u, 3b, 3u), as the newtx fonts have recently gained complete unicode maps; set pdf to load with single-page display rather than 2-page spread; add example of grid-style author block.
  
  v1.18 (2020/04/14): edit and expand documentation; revise sample .bib file; extensive edits to asmeconf.bst, to better support hyperlinks, to correct eid error, and for better conformance to ASME style (details listed in .bst file); add foreign language example.
diff --git a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-sample.bib b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-sample.bib
index 6cd209464bb..d7af55a758c 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-sample.bib
+++ b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-sample.bib
@@ -1,4 +1,4 @@
-%% Revised 14 April 2020
+%% Revised 7 November 2020
 %% John H. Lienhard, MIT
 
 @article{ning2002,
@@ -279,7 +279,7 @@
   title 	= {The \textsf{fancyhdr} and \textsf{extramarks} Packages, Version 3.10},
   organization = {Comprehensive \TeX\ Archive Network},
   year 		= {2019},
-  url 		= {https://www.ctan.org/pkg/lineno},
+  url 		= {https://www.ctan.org/pkg/fancyhdr},
   urldate 	= {August 17, 2019},
 }                           
 
diff --git a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf
index 7a53a2857c1..07ffba0dae1 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf
+++ b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf
diff --git a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
index f9804e00dae..81615a54aa1 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
+++ b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
@@ -3,7 +3,7 @@
 %%  This file is asmeconf-template.tex, a template to format ASME Conference papers according to
 %%  the requirements on ASME's conference web pages. 
 %%
-%%  This file is version 1.19 dated 2020/08/12
+%%  This file is version 1.20 dated 2020/11/08
 %%  
 %%  As of version 1.11, this template follows ASME's newer conference guidelines first posted July 2019.
 %% 			The new guidelines have changed the requested author block formatting to be inline. 
@@ -18,33 +18,35 @@
 %%  Class options are set up in the asmeconf.cls file. These include:
 %%
 %%          * 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
-%%          *    is recommended.
+%%          *    [varvw] for a v and w that are better distinguished from greek nu; and also 
+%%          *    [smallerops, varg, slantedGreek, frenchmath, varbb, cmbraces]. 
+%%			* 	 newtx version 1.5 or higher is recommended.
 %%
 %%          * 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)
+%%          *    example value used is: [mathalfa=cal=euler] (to 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 the ASME copyright footer: nofoot
+%%          * Options to: 	omit the ASME copyright footer [nofoot]; 
+%%							use government employee copyright notice [govt];
+%%							use government contractor copyright notice [contractor]
 %%
 %%          * An optional to use newtxtext's superiors font for footnotes [nodefaultsups] and an option
-%%          *    for slightly larger small capitals, largesc
+%%          *    for slightly larger small capitals [largesc]
 %%
 %%          * An option to balance the heights of columns on the last page [balance]. 
 %%          *    This option is NOT compatible with the [lineno] option.
 %%
 %%          * An option to include line numbers [lineno]. The lineno package does not number equation 
-%%          *    lines, captions, tables, etc. You must run _twice_ for proper placement of the line numbers. 
+%%          *    lines, captions, tables, etc. You must *run twice* for proper placement of the line numbers. 
 %%          *    This option will disable balancing column height on final page if that option has been invoked.
 %%          *    The lineno package won't always number the lines preceding displayed math in a paragraph because
 %%          *    paragraph has not ended.  See that package's documentation for macros to address this problem, or
 %%          *    just leave a blank line above the displayed equation while you are editing and then remove the 
 %%          *    blank line and [lineno] option when you move to your final version.
 %%
-%%          * An option to use the old grid arrangement of author names [oldauthors]. See Appendix B for usage,
-%%          *    because the authors and affiliations must be entered differently in this case.
+%%          * An option to use the traditional grid arrangement of author names [authorgrid]. See Appendix B for usage,
+%%          *    because the authors and affiliations must be entered differently in this case. (Same as former option [oldauthors])
 %%
 %%          * An option to allow hyphenation of the typewriter font [hyphenate]
 %%          *    Hyphenation is normally suppressed for typewriter mode because it is often used for code.
@@ -124,7 +126,6 @@
 
 \title{Place Title Here: Place Subtitle After Colon} % <=== change to YOUR title
  
-
 %   Put author names into the order you want. Use the same order for affiliations.
 %   \affil{#} tags the author's affiliation to the address in \SetAffiliation{#}.
 %   No space between last name and \affil{#}, separate names with commas.
@@ -162,7 +163,7 @@
 %%
 %% Abstract should be no more than 200 words
 \begin{abstract}
-This paper is an example of and a template for typesetting ASME Conference Papers in {\upshape\LaTeX}  using the {\upshape\texttt{asmeconf}} class. This class follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of early 2020. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style, which is part of this distribution. The class is compatible with the {\upshape\texttt{hyperref}} package, so that pdfs will contain internal and external hyperlinks, pdf bookmarks, and metadata. Links may be colored, for online use, or black, for publication. Section headers may contain mathematics, references, citations, and footnotes. The class enables inline author names, following ASME's current style, but is backward compatible to the traditional block style. The class includes many options, e.g., for math fonts. The class calls a number of packages, all of which are in {\upshape\TeX\ Live} and on CTAN. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
+This paper is an example of and a template for typesetting ASME Conference Papers in {\upshape\LaTeX} using the {\upshape\texttt{asmeconf}} class. This class follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of early 2020. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style, which is part of this distribution. The class is compatible with the {\upshape\texttt{hyperref}} package, so that pdfs will contain internal and external hyperlinks, pdf bookmarks, and metadata. Links may be colored, for online use, or black, for publication. Section headers may contain mathematics, references, citations, and footnotes. The class enables inline author names, following ASME's current style, but is backward compatible to the traditional block style. The class includes many options, e.g., for math fonts. The class calls a number of packages, all of which are in {\upshape\TeX\ Live} and on CTAN. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
 \end{abstract}
 
 %%%%%%%%%  NOMENCLATURE (OPTIONAL) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -443,7 +444,7 @@ The \texttt{asmeconf} class is not set up for use with the \texttt{fontspec} or
 \section{Additional Options for \NoCaseChange{\texttt{asmeconf.cls}}}
 The class accepts a number of options in addition to those already described. These options are discussed next.
 
-\subsection{Colored hyperlinks}
+\subsection{Colored Hyperlinks}
 ASME requires that all text be \textbf{in black} when the paper is submitted for publication.  For other uses, authors may
 obtain colored hyperlinks with the [\texttt{colorlinks}] option.
 
@@ -454,12 +455,14 @@ This package will attempt to give equal height to the two columns on the last pa
 
 The \texttt{lineno} package is not compatible with the \texttt{flushend} package that makes final short columns the same height. Balancing is automatically disabled when this option is called. 
 
-\subsection{Changing the Footer Text} The option \texttt{[nofoot]} will omit the ASME copyright from the first page footer. 
+\subsection{Changing the Copyright Footer} The option \texttt{[nofoot]} will omit the ASME copyright from the page footer. The option \texttt{[govt]} will produce a copyright notice for authors who are employees of the U.\ S.\ Government.  The option \texttt{[contractor]} will produce a copyright
+notice for authors who are employed by a U.\ S.\ Government contractor.
+
 The footers are generated with the \texttt{fancyhdr} package~\cite{oostrum}, so you can change them in any way you like using the commands of that package. Only the default arrangement of footers matches ASME's style, however.
 
 \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]}. 
 
-\subsection{Old-style Author Grid} The option \texttt{[oldauthors]} invokes ASME's old grid-style arrangement of author names.  The authors and affiliations must be entered differently in this case. See Appendix \ref{appendix:b} for usage.
+\subsection{Grid-Style Author Block} The option \texttt{[authorgrid]} invokes ASME's grid-style arrangement of author names.  The authors and affiliations must be entered differently in this case. See Appendix \ref{appendix:b} for usage.
 
 \subsection{Hyphenation of Typewriter Font} The option \texttt{[hyphenate]} will allow hyphenation of the typewriter font.
 Hyphenation is normally suppressed for typewriter mode because this font is often used for code.
@@ -505,24 +508,25 @@ Place any acknowledgments here.
 %% Equations will be numbered sequentially following those in the paper. Do not reset the equation counter.
 
 %% Here we use the optional argument for the pdf bookmark.
-\section[The vector product A\times B]{The vector product $\vec{A}\times\vec{B}$}\label{appendix:a}
+\section[The Vector Product A\times B]{The vector product $\vec{A}\times\vec{B}$}\label{appendix:a}
 
 This brief illustration of an appendix shows the numbering of the appendix and equations. Equations are numbered
 consecutively, following those in the paper.
 \begin{align}
-\frac{d\Gamma}{dt}   &{}= \int_{\mathcal{C}} \frac{D\mathbf{u}}{Dt} \cdot d\mathbf{r}\\
-                                  &{}= \iint_{\mathcal{S}} \nabla \times \frac{D\mathbf{u}}{Dt}  \cdot d\mathbf{A}\\
-                                  &{}= \iint_{\mathcal{S}}  \nabla p \times \nabla \left( \frac{1}{\rho}\right) \cdot d\mathbf{A}
+\frac{d\Gamma}{dt} &{}= \frac{d}{dt} \int_{\mathcal{C}} \mathbf{u} \cdot d\mathbf{r}\\
+				   &{}= \int_{\mathcal{C}} \frac{D\mathbf{u}}{Dt} \cdot d\mathbf{r} + \underbrace{\int_{\mathcal{C}} \mathbf{u}\cdot d\biggl( \frac{d\mathbf{r}}{dt}\Biggr)}_{=\, 0} \\[-2pt]
+                   &{}= \iint_{\mathcal{S}} \nabla \times \frac{D\mathbf{u}}{Dt}  \cdot d\mathbf{A}\\
+                   &{}= \iint_{\mathcal{S}}  \nabla p \times \nabla \left( \frac{1}{\rho}\right) \cdot d\mathbf{A}
 \end{align}
 
 
-\section{Option to use an author grid}\label{appendix:b}
+\section{Option to Use an Author Grid}\label{appendix:b}
 
 ASME's most recent templates place author names inline, with affiliations for all authors in rows below. 
 This style is the default for this template.  
 
-The historical style of authors with affiliation in a grid of blocks may be invoked with
-the option [\texttt{oldauthors}].  When using this form, the author names and addresses should be entered as below:
+The traditional style of putting authors with affiliation into a grid of blocks may be invoked with
+the option [\texttt{authorgrid}].  When using this form, the author names and addresses should be entered as below:
 
 \smallskip
 \noindent\verb|\SetAuthorBlock{Name\JointFirstAuthor}{%|
@@ -533,9 +537,13 @@ the option [\texttt{oldauthors}].  When using this form, the author names and ad
  \noindent\hbox{}\hfil\verb|Institution \\ City, Country}|
 \verb|\SetAuthorBlock{\CorrespondingAuthor{John Lienhard%|
  \hbox{}\hfil\verb|}{lienhard@mit.edu}}{Institution \\ City, State}|
- 
+\smallskip
+
 Directly usable code is contained at the very end of the \texttt{asmeconf-template.tex} file.
 
+Note that ASME interprets the author order in the grid style by reading names from left-to-right in the top row, then left-to-right in each
+subsequent row.
+
 %% directly usable code follows the \end{document} command below.
 
 
@@ -570,9 +578,8 @@ La chale ur pénètre, comme la gravité, toutes les substances de l'univers, se
 \end{document}
 
 
-%%% This is the set-up for the old author block style, a grid of blocks.
+%%% This is the set-up for the traditional author block style (a grid of blocks) using option [authorgrid]
 
-% Can also put multiple emails and use command more than once for multiple corresponding authors.
 % Change to your name[s] and addresses, in the desired order of authors. Up to nine author blocks.
 % Note usage below for joint first authors and for corresponding author.
 % First name, middle initial, last name
@@ -586,9 +593,9 @@ La chale ur pénètre, comme la gravité, toutes les substances de l'univers, se
 \SetAuthorBlock{Jinsoo Kim}{Institution or Company Name \\ City, Country}
 \SetAuthorBlock{Yusuf Yilmaz}{Institution or Company Name \\ City, Country}
 
-% Can omit second argument of \CorrespondingAuthor if putting email into address
+% Can omit second argument of \CorrespondingAuthor if putting email into address block
 %   i.e., can just use \CorrespondingAuthor{name}. 
-% Can also put multiple emails in the command and use more than once for multiple corresponding authors.
+% Can also put multiple emails in this command and use it more than once for multiple corresponding authors.
 
 \SetAuthorBlock{\CorrespondingAuthor{John H.\ Lienhard V}{lienhard@mit.edu}}{%
 Massachusetts Institute of Technology \\  Cambridge, MA}
diff --git a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
index b1f0ec6b349..2f1932a0d89 100644
--- a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
+++ b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
@@ -5,9 +5,9 @@
 %%
 %%  Please note that ASME's journals follow specifications different from ASME conference papers.
 %%
-%%  This file is version 1.19 dated 2020/08/12.
-	\def\versionno{1.19}
-	\def\versiondate{2020/08/12\space}
+%%  This file is version 1.20 dated 2020/11/08.
+	\def\versionno{1.20}
+	\def\versiondate{2020/11/08\space}
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -34,7 +34,7 @@
 %%  This class is not designed for unicode-math or fontspec, given that the ASME conference style is
 %%  specific with respect to the font selections.
 %%
-%%  Options for the class are configured on lines 79-210. 
+%%  Options for the class are configured on lines 79-216. 
 %%
 %%  The class defines two environments: abstract and nomenclature. The latter has an optional argument to 
 %%  control the space between the entries and the definitions.
@@ -79,22 +79,18 @@
 %%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{ifthen}
-\RequirePackage{iftex} % check whether pdftex or another engine is used
-\newboolean{DefaultSups}
-\setboolean{DefaultSups}{true}
-\newboolean{Oldauthors}
-\setboolean{Oldauthors}{false}
-\newboolean{Balance}
-\setboolean{Balance}{false}
-\newboolean{lineno}
-\setboolean{lineno}{false}
-\newboolean{setpdfa}
-\setboolean{setpdfa}{false}
-\newboolean{pdfaone}
-\setboolean{pdfaone}{false}
+\RequirePackage{iftex} 	% check whether pdftex or another engine is used
+
+\newboolean{Balance}\setboolean{Balance}{false}
+\newboolean{DefaultSups}\setboolean{DefaultSups}{true}
+\newboolean{contractor}\setboolean{contractor}{false}
+\newboolean{govt}\setboolean{govt}{false}
+\newboolean{lineno}\setboolean{lineno}{false}
+\newboolean{Oldauthors}\setboolean{Oldauthors}{false}
+\newboolean{pdfaone}\setboolean{pdfaone}{false}
+\newboolean{setpdfa}\setboolean{setpdfa}{false}
 
 \RequirePackage{kvoptions}
-%\RequirePackage{kvsetkeys} % already loaded by kvoptions
 \SetupKeyvalOptions{
   family=asmeconf,
   prefix=asmeconf@,
@@ -103,6 +99,27 @@
   setkeys=\kvsetkeys,
 }
 
+%%% set key [balance] to balance column height on last page.
+\define@key{asmeconf}{balance}[true]{%
+      \setboolean{Balance}{#1}
+	  \ClassWarningNoLine{asmeconf}{Loading flushend package to balance column height on last page}%
+}
+
+%%% set key [contractor] to obtain government contractor copyright notice.
+\define@key{asmeconf}{contractor}[true]{%
+      \setboolean{contractor}{#1}
+}
+
+%%% set key [govt] to obtain government employee copyright notice.
+\define@key{asmeconf}{govt}[true]{%
+      \setboolean{govt}{#1}
+}
+
+%%% set key [lineno] to obtain line numbers.
+\define@key{asmeconf}{lineno}[true]{%
+      \setboolean{lineno}{#1}
+}
+
 %%% for mathalfa, we may now pass options in this format:  mathalfa=cal=euler, mathalfa=frak=boondox
 \define@key{asmeconf}{mathalfa}{%
   \PassOptionsToPackage{#1}{mathalfa}%
@@ -113,21 +130,6 @@
       \setboolean{DefaultSups}{#1}
 }
 
-%%% set key [nodefaultsups] to obtain newtx superiors font for footnotes.
-\define@key{asmeconf}{nodefaultsups}[false]{%
-      \setboolean{DefaultSups}{#1}
-}
-
-%%% set key [balance] to balance column height on last page.
-\define@key{asmeconf}{balance}[true]{%
-      \setboolean{Balance}{#1}
-	  \ClassWarningNoLine{asmeconf}{Loading flushend package to balance column height on last page}%
-}
-
-%%% set key [lineno] to obtain linenumbers.
-\define@key{asmeconf}{lineno}[true]{%
-      \setboolean{lineno}{#1}
-}
 
 %%% set key [lang,lang-second,lang-third] to pass languages to babel.
 
@@ -153,16 +155,16 @@
 	\define@key{pdfaopt}{pdf-a}[true]{%
       \setboolean{setpdfa}{#1}%
       \PassOptionsToPackage{pdfa,pdfapart=3,pdfaconformance=u}{hyperref}%
-}
+	}
 %%% to select part 1, 2 or 3 
 	\define@key{pdfaopt}{pdfapart}[3]{%
       \PassOptionsToPackage{pdfapart=#1}{hyperref}%
 	  \ifthenelse{\equal{#1}{1}}{\setboolean{pdfaone}{true}}{\relax}%
-}
-%% to select conformance b or u.  NB: a is not possible with pdfLaTeX, and u is not possible with 1.
+	}
+%%% to select conformance b or u.  NB: a is not possible with pdfLaTeX, and u is not possible with 1.
 	\define@key{pdfaopt}{pdfaconformance}[u]{%
       \PassOptionsToPackage{pdfaconformance=#1}{hyperref}%
-}
+	}
 	\ProcessKeyvalOptions{pdfaopt}
 \else
 	\ClassWarningNoLine{asmejour}{PDF/A compliance option requires pdfLaTeX engine}%
@@ -173,12 +175,12 @@
 %% option to have colored hyperlinks
 \DeclareOption{colorlinks}{%
 	\PassOptionsToPackage{colorlinks=true}{hyperref}%
-   }
+}
 
 %% option to omit ASME footer
 \DeclareOption{nofoot}{%
    \AtBeginDocument{\pagestyle{plain}}%
-   }
+}
 
 %% Access many options from newtxmath. See newtx documentation for details.
 \DeclareOption{upint,smallerops,varvw,varg,uprightGreek,slantedGreek,frenchmath,varbb,cmbraces}{\PassOptionsToPackage{}{newtxmath}}
@@ -189,11 +191,16 @@
 %% Option not to use latex default superscripts, instead using the newtxtext superiors font [nodefaultsups]
 \ifthenelse{\boolean{DefaultSups}}{\PassOptionsToPackage{defaultsups}{newtxtext}}{\relax}
 
-%% option to use old authors
+%% option to use grid of authors
+\DeclareOption{authorgrid}{%
+      \setboolean{Oldauthors}{true}%
+	  \ClassWarningNoLine{asmeconf}{Selected option for a grid of author blocks}%
+}
+%% retained for backward compatibility
 \DeclareOption{oldauthors}{%
       \setboolean{Oldauthors}{true}%
 	  \ClassWarningNoLine{asmeconf}{Selected option for a grid of author blocks}%
-   }
+}
 
 %% Option to hyphenate the typewriter font [hyphenate]
 \DeclareOption{hyphenate}{%
@@ -206,14 +213,11 @@
 
 \ProcessOptions \relax
 
-
 %%%%%%%%%%%%% end options %%%%%%%%%%%%%%%%%%%
 
-
-\RequirePackage[letterpaper, left=0.5in, right=0.5in, top=0.5in, bottom = 1.in, footskip=0.5in]{geometry}
+\RequirePackage[letterpaper, left=0.5in, right=0.5in, top=0.5in, bottom = 1.in, footskip=0.5in, columnsep=0.38in]{geometry}
 % conforms to ASME required margins
 \setlength\parindent{0.25in}
-\setlength\columnsep{0.38in}
 
 \RequirePackage[sort&compress,numbers]{natbib} 
 \setlength\bibsep{1pt plus 1pt minus 1pt}
@@ -300,12 +304,27 @@
 \pagestyle{fancy}
 
 \fancyfoot{}
+\fancyhead{}
 \fancyfoot[CE,CO]{\thepage}
 \fancyfoot[RO,RE]{Copyright~\textcopyright~\the\year\ by ASME}
-\fancyhead{}
 \renewcommand{\headrulewidth}{0pt} 
 \renewcommand{\footrulewidth}{0pt}
 
+\ifthenelse{\boolean{govt}}{%
+	\newgeometry{left=0.5in, right=0.5in, top=0.5in, bottom = 1.in, footskip = 0.3in, columnsep = 0.38in}
+	\fancyfoot[RO,RE]{}
+	\fancyfoot[CE,CO]{\thepage\\[1ex]\small 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.}
+	}{\relax
+}
+
+\ifthenelse{\boolean{contractor}}{%
+	\newgeometry{left=0.5in, right=0.5in, top=0.5in, bottom = 1.in, footskip = 0.3in, columnsep = 0.38in}
+	\fancyfoot[RO,RE]{}
+	\fancyfoot[CE,CO]{\thepage\\[1ex]\footnotesize 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.}
+	}{\relax
+}
+
+
 %%%%%% footnotes %%%%%%%
 
 \RequirePackage{fnpos}
@@ -387,18 +406,18 @@
 	\InputIfFileExists{glyphtounicode-ntx.tex}{}{} 	%% additional mappings
 %
 %%% a fairly generic RGB color profile, aimed at on-screen rendering (not print production)
-\immediate\pdfobj stream attr{/N 3} file{sRGB.icc}
-\pdfcatalog{%
-  /OutputIntents [
-    <<
-      /Type /OutputIntent
-      /S /GTS_PDFA1
-      /DestOutputProfile \the\pdflastobj\space 0 R
-      /OutputConditionIdentifier (sRGB)
-      /Info (sRGB)
-    >>
-  ]
-}%
+	\immediate\pdfobj stream attr{/N 3} file{sRGB.icc}
+	\pdfcatalog{%
+	  /OutputIntents [
+	    <<
+	      /Type /OutputIntent
+	      /S /GTS_PDFA1
+	      /DestOutputProfile \the\pdflastobj\space 0 R
+	      /OutputConditionIdentifier (sRGB)
+	      /Info (sRGB)
+	    >>
+	  ]
+	}%
 }{\relax}
 
 \RequirePackage{hyperxmp} %% to fix transfer of metadata to Acrobat pdf 
@@ -488,11 +507,6 @@
 
 %%%%%%%%%%%%%  Line numbering and balancing columns on last page  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ifthenelse{\boolean{lineno}}{%
-    \RequirePackage[switch,mathlines]{lineno}    
-    \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}} 
-    \AtBeginDocument{\linenumbers}
-    \ClassWarningNoLine{asmeconf}{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.
@@ -507,11 +521,18 @@
 }
 
 \NewDocumentCommand{\FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\FixAMSMath}}
-\FixAll{align;alignat;gather;flalign;multline}
 
+%%% Adjustments when lineno option is used
+\ifthenelse{\boolean{lineno}}{%
+    \RequirePackage[switch,mathlines]{lineno}    
+    \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}} 
+    \AtBeginDocument{\linenumbers}
+    \ClassWarningNoLine{asmeconf}{Package lineno loaded, so final column balancing is disabled}
+	\FixAll{align;alignat;gather;flalign;multline}
     }{%
     \ifthenelse{\boolean{Balance}}{\RequirePackage{flushend}}{\relax}  % flushend is NOT compatible with lineno
 }
+%%% Enable dropping lineno option without trashing .aux file
 \providecommand{\@LN@col}[1]{\relax}
 \providecommand{\@LN}[2]{\relax}