CTAN sync 202001260301

4 files changed, 15 insertions, 13 deletions

diff --git a/macros/latex/contrib/asmeconf/README.md b/macros/latex/contrib/asmeconf/README.md
index cf7d7625fe..6dabe3eae3 100644
--- a/macros/latex/contrib/asmeconf/README.md
+++ b/macros/latex/contrib/asmeconf/README.md
@@ -1,7 +1,7 @@
  
   #asmeconf: A template for ASME conference papers#
  
-  Version 1.14 dated 2019/12/25.
+  Version 1.15 dated 2020/01/24.
 
   ####Overview####
   This class provides a template to format ASME Conference papers according to
@@ -67,6 +67,8 @@
  
  ####Change log####
  
+ v1.15: correct extra space left by \\CorrespondingAuthor when that author is not last; correct breakage of \\ref and \\eqref in captions.  Thanks to Bret Van Poppel for reporting these issues.
+ 
  v1.14: edit documentation; use 2020 IMECE header in layout example
  
  v1.13: add babel options for language support; minor text edits; adjust nomenclature list penalties
diff --git a/macros/latex/contrib/asmeconf/asmeconf-template.pdf b/macros/latex/contrib/asmeconf/asmeconf-template.pdf
index 617978edc6..14dbd71208 100644
--- a/macros/latex/contrib/asmeconf/asmeconf-template.pdf
+++ b/macros/latex/contrib/asmeconf/asmeconf-template.pdf
diff --git a/macros/latex/contrib/asmeconf/asmeconf-template.tex b/macros/latex/contrib/asmeconf/asmeconf-template.tex
index d89b503bd6..bc2fb371c0 100644
--- a/macros/latex/contrib/asmeconf/asmeconf-template.tex
+++ b/macros/latex/contrib/asmeconf/asmeconf-template.tex
@@ -6,7 +6,7 @@
 %%  The new guidelines have changed the request author block formatting.
 %%  Nomenclature follows the abstract.  Abstract is in italics.
 %%
-%%  This file is version 1.14 dated 2019/12/25.
+%%  This file is version 1.15 dated 2020/01/24.
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -226,7 +226,7 @@ For ASME conference papers, the labels Equation and Figure should be abbreviated
 %% captions go below figures
 \begin{figure}
 \centering\includegraphics[width=0.7\linewidth]{sample-figure-1.pdf}
-\caption{A figure caption with math, $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
+\caption{Figure caption with math, eqn.~\eqref{eqn:fourier}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
 \end{figure}
  
 %%%%%%%%%%%%% end figure %%%%%%%%%%%%%%%%%%%
diff --git a/macros/latex/contrib/asmeconf/asmeconf.cls b/macros/latex/contrib/asmeconf/asmeconf.cls
index 8120904b20..0eda4a2701 100644
--- a/macros/latex/contrib/asmeconf/asmeconf.cls
+++ b/macros/latex/contrib/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.14 dated 2019/12/25.
-	\def\versionno{1.14}
-	\def\versiondate{2019/12/25\space}
+%%  This file is version 1.15 dated 2020/01/24.
+	\def\versionno{1.15}
+	\def\versiondate{2020/01/24\space}
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -392,7 +392,7 @@
 %% if given in section headings. Ditto for \eqref
 \RequirePackage{xpatch}     
 \xpatchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{}{}
-\xpatchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\eqref\@nonchangecase\footnote}{}{}
+\xpatchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\eqref}{}{} %% correct 24 Jan 2020
      
 
 %%% Create an optional argument for unnumbered sections and set pdf bookmark (thru \addcontentsline).
@@ -690,18 +690,18 @@
 %% Flag for corresponding author (expecting just one, but if two enter both email addresses and flag both authors)
 \newif\ifCA\CAfalse
 
-% allow for NO email address to be given by omitting the argument (g argument is deprecated, seems to have trouble with \IfNoValueTF)
+% allow for NO email address to be given by omitting the argument (g argument is deprecated, seems to have trouble with \IfNoValueTF)     %% corrected spacing error 24 Jan 2020
 \DeclareDocumentCommand{\CorrespondingAuthor}{g}{%
    \ignorespaces$\bm{^\ast}$%
    \global\CAtrue%
  %  \IfNoValueTF{#1}{%
    \ifblank{#1}{%
-         \gdef\@CAsep{\relax}
-         \gdef\@CAemail{\relax}
+         \gdef\@CAsep{\relax}%
+         \gdef\@CAemail{\relax}%
          }{%
-         \gdef\@CAsep{:\space}
-         \gdef\@CAemail{#1}
-   }
+         \gdef\@CAsep{:\space}%
+         \gdef\@CAemail{#1}%
+   }%
 }
 
 %%% Flag for joint first authors (two or more)