asmeconf (11mar22)

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

11 files changed, 35 insertions, 27 deletions

diff --git a/Master/texmf-dist/doc/latex/asmeconf/README.md b/Master/texmf-dist/doc/latex/asmeconf/README.md
index 66bbf88e307..c45516e710a 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 latex template for ASME conference papers#
  
-  Version 1.28 dated 2022/02/14.
+  Version 1.29 dated 2022/03/10.
 
   ####Overview####
   This class provides a LaTeX template for ASME Conference papers formatted according to
@@ -79,6 +79,12 @@
  ---
  
  ####Change log####
+ v1.29 (2022/03/10)
+ - Include current date and venue for 2022 IMECE (subject to change)
+ - Edit example .tex file for asmewide.sty to remove description of unreleased development code
+ - Fix bug in nofoot option that stopped capitalization of captions
+ - Adjust scale factors on typewriter (raise to 1.05) and sans serif fonts (lower to 0.91)
+  
  v1.28 (2022/02/14)
  - Introduce asmewide.sty, an experimental package for setting page-width equations in a two column format. A document with examples of use is included.
  - Increase scale of sans serif font under fontspec from 0.9 to 0.94, to better match newtxtext under pdflatex
diff --git a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf
index 81365c217ca..1544f87ee3d 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 1e3c938e79a..8d3fbfb4850 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
+++ b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
@@ -4,7 +4,7 @@
 %%  This file is asmeconf-template.tex, a LaTeX template to format ASME Conference papers according to
 %%  the requirements on ASME's conference web pages, and including hypertext support for the pdf.
 %%
-%%  This file is version 1.28 dated 2022/02/14
+%%  This file is version 1.29 dated 2022/03/10
 %%  
 %%  As of version 1.11, this template defaults to ASME's newer conference guidelines first posted July 2019.
 %% 			Those guidelines changed the requested author block formatting to be inline. 
@@ -113,8 +113,8 @@
 
 \ConfName{Proceedings of the ASME 2022\linebreak International Mechanical Engineering Congress and Exposition}
 \ConfAcronym{IMECE2022}
-\ConfDate{November XX-YY, 2022} % update once this is known (expected March 2022)
-\ConfCity{Location, ST} % update once this is known (expected March 2022)
+\ConfDate{October 30--November 3, 2022} % update 
+\ConfCity{Columbus, OH} % update 
 \PaperNo{IMECE2022-XXXX}
 
 % Units of measure (e.g., cm) and other specialty lowercase terms in the title should be 
diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-authorgrid-example.pdf b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-authorgrid-example.pdf
index 600ff302015..d765aef5a37 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-authorgrid-example.pdf
+++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-authorgrid-example.pdf
diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.pdf b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.pdf
index c2fc29a440f..05e276803f4 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.pdf
diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.tex b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.tex
index c4ae6c04977..242e35ce919 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.tex
+++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.tex
@@ -188,7 +188,7 @@ The needed fonts are listed in Table~\ref{tab:2}.
 %%%%%%%%%%%%%%% two column table %%%%%%%%%%%%%%%%%% 
 \NewDocumentCommand\R{O{11pt}}{\rule{0pt}{#1}}
 \begin{table*}[t!]
-\caption{System fonts used by \AC\ with \FS. For all fonts, load regular and bold face.  For Latin, Cyrillic, and Greek, also load italic and bold italic. For Noto Sans Arabic, install semibold instead of bold.\label{tab:2}}%
+\caption{System fonts used by \NoCaseChange{\AC} with \NoCaseChange{\FS}. For all fonts, load regular and bold face.  For Latin, Cyrillic, and Greek, also load italic and bold italic. For Noto Sans Arabic, install semibold instead of bold.\label{tab:2}}%
 \centering{%
 \begin{tabular*}{\textwidth}{@{\hspace*{0.5em}}@{\extracolsep{\fill}}>{\raggedright}p{6em}>{\raggedright}p{12em}>{\raggedright}p{10em}p{23em}@{\hspace*{0.5em}}}
 \toprule
diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.pdf b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
index 3443ed04257..08d31a1ec54 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
+++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.tex b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.tex
index 891c2207d7b..7857276b96c 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.tex
+++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.tex
@@ -191,7 +191,7 @@ Here, $A$ is a constant. We may adopt a fourth-order Runge-Kutta algorithm for t
 
 The algorithm is implemented directly in the preamble of this file, and the results are plotted in Fig.~\ref{fig:1} for $A = \{0.25, 0.5, 0.75, 1.0\}$. Plotting is done using the \texttt{PGFPLOTS} package~\cite{pgfplots}.
 
-Landscape figures, such as Fig.~\ref{fig:1}, may be produced at full-page size by putting \verb|\usepackage[figuresright]{rotating}| in your \texttt{.tex} file's preamble and using the \texttt{sidewaysfigure*} environment~\cite{fairbairns}.
+Landscape figures may be produced at full-page size by putting \verb|\usepackage[figuresright]{rotating}| (Fig.~\ref{fig:1}) into your \texttt{.tex} file's preamble and using the \texttt{sidewaysfigure*} environment~\cite{fairbairns}.
 
 \begin{sidewaysfigure*}
 \begin{tikzpicture}
diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.pdf b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.pdf
index 3b915adbcc0..cf119cdbdee 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.pdf
+++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.pdf
diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.tex b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.tex
index 209cf294ca1..2456b0266d6 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.tex
+++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.tex
@@ -11,15 +11,14 @@
 %%
 %%  NB: the strip environment from cuted is incompatible with the [lineno] option to asmeconf!
 
-\documentclass[nofoot,colorlinks,balance,pdf-a]{asmeconf}
+\documentclass[nofoot,colorlinks,balance,pdf-acolorlinks,balance,pdf-a]{asmeconf}
 
-\def\ACwidetextversion{1.0}
-\def\ACwidetextdate{January 10, 2022}
+\def\ACwidetextversion{1.1}
+\def\ACwidetextdate{February 15, 2022}
 
 \usepackage{lipsum}% Latin filler text
 \usepackage{asmewide}
 
-
 \begin{filecontents}{asme-wide-equations.bib}
 @online{lienhard2021,
   author = {Lienhard, John H., V},
@@ -123,7 +122,6 @@ to be read---the rest is simply filler to aid in layout.}
 \subsection{Subsection}
 \lipsum[5-6]
 
-
 %%%%%%%%%%%%%%%%%%%%  Example WT1  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Single Wide Equation on the Page}
 
@@ -226,15 +224,16 @@ Our competitor's data                      &  72.321   &  141.384 \\[1pt]
 \end{table*}
 %%%%%%%%%%%%%%%% end table %%%%%%%%%%%%%%%%%%% 
 
-\lipsum[17-24]
+\lipsum[17-23]
 
+\lipsum[24]
 
 %%%%%%%%%%%%%%%%%%%%  Examples WT4 & WT5  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Wide Equation Pair Split Across Page Break and Followed by Wide Equation}
 
-\textcolor{red}{Here, we turn off automatic top line so that it does not appear again at the top of the next page: \texttt{\textbackslash TopLineOff}. We instead issue a command to create the top line inside the \texttt{widetext} environment, \texttt{\textbackslash LineAbove}.  We must remember to restore the automatic top line after we exit the \texttt{widetext} environment: \texttt{\textbackslash TopLineOn}.}
+\textcolor{red}{Note that the upper rule is cleared after the first use in a \texttt{widetext} environment. This means that it will not show up at the top of the next page.}
 
-\textcolor{red}{The \texttt{\textbackslash newpage} command may optionally be used between the equations to force the second one onto the following page, e.g., try removing the source code line \texttt{\textbackslash lipsum[27]} with and without \texttt{\textbackslash newpage}.}
+\textcolor{red}{The \texttt{\textbackslash newpage} command may optionally be used between the equations to force the second one onto the following page, e.g., try removing the source code line \texttt{\textbackslash lipsum[24]} with and without \texttt{\textbackslash newpage}.}
 
 \begin{widetext}
 \begin{equation}\mathbf{WT4:}
@@ -295,7 +294,7 @@ q_\textrm{gray}  & q_\textrm{int, $T_1$} & q_\textrm{int, $T_m$} & q_\textrm{exa
 
 \lipsum[50-60]
 
-\textcolor{red}{In this case, we drop the top line: \texttt{\textbackslash begin\{widetext\}[][b]}.}
+\textcolor{red}{In the following example, we leave out the top line: \texttt{\textbackslash begin\{widetext\}[][b]}.}
 
 \vskip 80pt% <== an extra skip to push this widetext over the edge
 
diff --git a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
index 8a2a2c952fc..e513eee7b80 100644
--- a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
+++ b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
@@ -5,8 +5,8 @@
 %%  ASME conference requirements as represented on ASME's conference web pages in 2022.
 %%
 %%  This file's version and date:
-	\def\versionno{1.28}
-	\def\versiondate{2022/02/14\space}
+	\def\versionno{1.29}
+	\def\versiondate{2022/03/10\space}
 %%
 %%  Author: John H. Lienhard, V
 %%          Department of Mechanical Engineering
@@ -349,9 +349,9 @@
 \DeclareOption{lineno}{\ac@linenotrue}
 
 %% option to omit ASME footer [nofoot]
-\DeclareOption{nofoot}{%
-   \AtBeginDocument{\pagestyle{plain}}%
-}
+\newif\ifac@nofoot\ac@nofootfalse
+\DeclareOption{nofoot}{\ac@nofoottrue}
+
 
 %%% option [contractor] to obtain government contractor copyright notice.
 \newif\ifac@contractor\ac@contractorfalse
@@ -507,12 +507,12 @@
 \RequirePackage[]{babel}
 
 \ifpdftex
-    \RequirePackage[]{newtxtext}
-    \RequirePackage[varqu,varl]{inconsolata}% sans typewriter font
+    \RequirePackage[helvratio=.91]{newtxtext}% rescaled 22/03/10
+    \RequirePackage[varqu,varl,scale=1.05]{inconsolata}% sans typewriter font % rescaled 22/03/10
     \RequirePackage[]{newtxmath}
 \else
     \ifac@fontspec
-        \RequirePackage[varqu,varl]{inconsolata}  % typewriter font for math
+        \RequirePackage[varqu,varl]{inconsolata}  % typewriter font for math 
         \renewcommand\rmdefault{ntxtlf}           % roman font for math
 		\RequirePackage[T1]{fontenc} 			  % qhv is not TU encoded, 2021/12/24
 	        \DeclareFontFamily{T1}{\sfdefault}{}  % sf for math
@@ -538,11 +538,11 @@
         	BoldFont = *-bold,
         	BoldItalicFont = *-bolditalic,
 			Numbers = Lining,
-        	Scale=0.94,% same as for newtx; former value 0.9 too small 2022/01/15
+        	Scale=0.91,% same as for newtx; former value 0.9 too small 2022/01/15
 			]        
        \setmonofont{Inconsolatazi4}[% This otf font ships with the LaTeX Inconsolata package (it's in TeX Live)
             \MonoNotMono,% match newtxtext if we enable wordspacing
-            Scale=1,
+            Scale=1.05,% rescaled from 1, 22/03/10
             Extension = .otf,
             UprightFont = *-Regular,
             ItalicFont = *-Regular,% has no italic face
@@ -905,8 +905,8 @@
 	\babelprovide[import, captions/abstract = Muhtasari, language = Default]{swahili}
 %	
     \else % use lualatex without font support for other languages (easier set-up and still enables luacode for numerics)
-        \RequirePackage[nofontspec]{newtxtext}% will lose some accented characters this way ... better to use fontspec
-        \RequirePackage[varqu,varl]{inconsolata}% sans typewriter font
+        \RequirePackage[nofontspec,helvratio=0.91]{newtxtext}% will lose some accented characters this way ... better to use fontspec
+        \RequirePackage[varqu,varl,scale=1.05]{inconsolata}% sans typewriter font
         \RequirePackage[]{newtxmath}
     \fi
 \fi
@@ -999,6 +999,9 @@
 	\fancyfoot[CE,CO]{\@SetFont\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.}
 \fi
 
+\ifac@nofoot
+		\fancyfoot[RO,RE]{}
+\fi
 %%%%%% footnotes %%%%%%%
 
 \RequirePackage{fnpos}