asmejour (23may19)

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

4 files changed, 63 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/asmejour/README.md b/Master/texmf-dist/doc/latex/asmejour/README.md
index e0cc8e7ece2..963ec282a75 100644
--- a/Master/texmf-dist/doc/latex/asmejour/README.md
+++ b/Master/texmf-dist/doc/latex/asmejour/README.md
@@ -1,7 +1,7 @@
  
   #asmejour: A template for ASME journal papers#
  
-  Version 1.01 dated 2019/04/28.
+  Version 1.02 dated 2019/05/22.
 
   ####Overview####
   This class provides a template to format preprints submitted to ASME journals in the style that 
@@ -57,6 +57,8 @@
  
  ####Change log####
  
+v1.02:  adjust formats of 2nd and 3rd level headings; add option for line numbers; eqn tags in blue
+ 
 v1.01:  edit documentation, remove development code
  
 v1.00:  initial release
diff --git a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf
index 9b6af4a19a3..e42d18d3063 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 ed21288340a..cb6c8457faf 100644
--- a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
+++ b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
@@ -2,7 +2,7 @@
 %%  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.
 %%
-%%  This file is version 1.01 dated 2019/04/28
+%%  This file is version 1.02 dated 2019/05/22
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -14,6 +14,11 @@
 %%          * 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 include line numbers [lineno]. The lineno package does not number equation 
+%%          *    lines, captions, etc. You must run twice for proper placement. 
+%%          *    If you have been using lineno and then disable it, you may see errors about \@LN@col 
+%%          *    undefined. To resolve this, delete your aux file.
+%%
 %%          * 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
@@ -81,7 +86,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},    % <=== change to YOUR pdf keywords
 	pdfauthor={John H. Lienhard},                          % <=== change to YOUR name[s]!!!
 }
 
@@ -261,6 +266,7 @@ Elementary support for \texttt{eprint} numbers is also included, generating a ur
 %%
 \section*[Math in a Section Heading: \omega\cdot U=0]{Math in a Section Heading: $\hat{\upomega}\cdot\hat{\mathrm{U}}=0$}
 
+The rest of this is fake Latin text to demonstrate formats.
 \lipsum[6] % <=== This command generates paragraphs of fake Latin.  Delete it here and elsewhere!
 
 
@@ -362,6 +368,9 @@ d\mathbf{w} =
 \end{equation}
 Note ASME style for vectors, $\mathbf{w}$, and matrices, $\bm{J}_1$.
 
+\subsubsection*{Third Level Heading}
+\lipsum[13]
+
 %%%%%%%%%%%%%%% begin table %%%%%%%%%%%%%%%%%% 
 \begin{table*}[t]
 \caption{A table spanning two columns}\label{tab:4}%
@@ -407,9 +416,14 @@ Note ASME style for vectors, $\mathbf{w}$, and matrices, $\bm{J}_1$.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section*{Acknowledgements}
+\section*{Acknowledgement}
 \lipsum[17] % <=== This command generates paragraphs of fake Latin.  Delete it here and elsewhere!
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section*{Funding Data}
+\begin{itemize}
+\item U.S.\ Department of Heat Transfer, Office of Important Ideas (DOHT Award No.\ 3.14159265)
+\end{itemize}
 
 
 %%%%%%%%%  NOMENCLATURE  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
index 1dfd3152fd4..28409c63cac 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.01 dated 2019/04/28.
+%%  This file is version 1.02 dated 2019/05/22.
 %%
 %%  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 73-123. 
+%%  Options for the class are described on lines 73-133. 
 %%
 %%  The class defines an environment for nomenclature. LaTeX must be run twice to align those columns.
 %% 
@@ -52,40 +52,48 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{asmejour}[2019/04/28 asmejour paper format]
+\ProvidesClass{asmejour}[2019/05/22 asmejour paper format]
 
 \LoadClass[twoside,9pt,twocolumn]{extarticle}
 
 %%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{ifthen}
+
 \newboolean{DefaultSups}
 \setboolean{DefaultSups}{true}
 
+\newboolean{lineno}
+
 \RequirePackage{kvoptions}
 \RequirePackage{kvsetkeys}
 \SetupKeyvalOptions{
-  family=asmeconf,
-  prefix=asmeconf@,
+  family=asmejour,
+  prefix=asmejour@,
   setkeys=\kvsetkeys,
 }
 
 %%% for mathalfa, so we may pass options in this format:  mathalfa=cal=euler, mathalfa=frak=boondox
-\define@key{asmeconf}{mathalfa}{%
+\define@key{asmejour}{mathalfa}{%
       \PassOptionsToPackage{#1}{mathalfa}%
 }
 
 %%% set key [nodefaultsups] to obtain newtx superiors font for footnotes.
-\define@key{asmeconf}{nodefaultsups}[false]{%
+\define@key{asmejour}{nodefaultsups}[false]{%
       \setboolean{DefaultSups}{#1}
 }
 
 %%% set barcolor= to a value defined by xcolor package
 \newcommand\@ColorName{black} % default
-\define@key{asmeconf}{barcolor}[Red4]{%
+\define@key{asmejour}{barcolor}[Red4]{%
       \renewcommand\@ColorName{#1}
 }
 
+%%% set key [lineno] to obtain linenumbers.
+\define@key{asmejour}{lineno}[true]{%
+      \setboolean{lineno}{#1}
+}
+
 \ProcessKeyvalOptions*
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -111,6 +119,7 @@
     }   
 }
 
+
 %% Access many options from newtxmath. See newtxmath documentation for details.
 \DeclareOption{upint,smallerops,varvw,varg,slantedGreek,frenchmath,varbb,cmbraces}{\PassOptionsToPackage{}{newtxmath}}
 
@@ -198,6 +207,22 @@
 \renewcommand\Huge{\@setfontsize\Huge{26.5}{26.5}}    %... for title font only
 
 
+%%%%%%%%%%%%%%%%%  LINE AND EQUATION NUMBERING  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\ifthenelse{\boolean{lineno}}{%
+    \RequirePackage[switch]{lineno}    
+    \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}} 
+    \AtBeginDocument{\linenumbers}
+    }{%
+    \relax%
+}
+%% ASME page proofs seem to align these at top of baseline, rather than bottom as done here.
+
+%% ASME puts equation tags in blue
+\RequirePackage{xpatch}
+\xpatchcmd{\tagform@}{(\ignorespaces#1\unskip\@@italiccorr)}{\color{blue}(\ignorespaces#1\unskip\@@italiccorr)}{}{}
+
+
 %%%%%%%%%%%%%%%%%  FOOTER SET UP  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%% footer text names %%%%%%%%%%
@@ -270,18 +295,18 @@
 
 \RequirePackage[raggedright,indentafter]{titlesec}
 
-\titleformat{\section}{\mathversion{bold}\bfseries\large\raggedright}{\thesection}{0.5em}{}
-\titleformat{\subsection}[runin]{\mathversion{bold}\bfseries}{\thesubsection}{0.5em}{}[.]
+\titleformat{\section}{\mathversion{bold}\bfseries\large\raggedright}{\thesection}{1em}{}
+\titleformat{\subsection}[runin]{\mathversion{bold}\bfseries}{\thesubsection}{1em}{}[.]
+\titleformat{\subsubsection}[runin]{\itshape}{\thesubsubsection}{1em}{}[.]
 
 \titlespacing\section{0pt}{14pt plus 3pt minus 2pt}{3pt plus 2pt minus 1pt} 
-\titleformat{\subsection}[runin]{\mathversion{bold}\bfseries}{\thesubsection}{0.5em}{}[.]
-
-%% ASME style does not seem to go lower than subsection, so ...
-%% ....putting \subsubsection and \paragraph into \subsection settings.
-\titleformat{\subsubsection}[runin]{\mathversion{bold}\bfseries}{\thesubsection}{0.5em}{}[.]
-\titleformat{\subsubsection}[runin]{\mathversion{bold}\bfseries}{\thesubsection}{0.5em}{}[.]
-\titleformat{\paragraph}[runin]{\mathversion{bold}\bfseries}{\thesubsection}{0.5em}{}[.]
-\titleformat{\paragraph}[runin]{\mathversion{bold}\bfseries}{\thesubsection}{0.5em}{}[.]
+\titlespacing{\subsection}{\parindent}{14pt plus 3pt minus 2pt}{0.5em}
+\titlespacing{\subsubsection}{\parindent}{14pt plus 3pt minus 2pt}{0.5em}
+
+%% ASME style does not seem to go lower than third level heading, so ...
+%% ....putting \paragraph into \subsubsection settings.
+\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