CTAN sync 202003010301

4 files changed, 41 insertions, 21 deletions

diff --git a/macros/latex/contrib/asmeconf/README.md b/macros/latex/contrib/asmeconf/README.md
index 2039844683..87f8916cbb 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.16 dated 2020/02/28.
+  Version 1.17 dated 2020/02/29.
 
   ####Overview####
   This class provides a template to format ASME Conference papers according to
@@ -67,6 +67,8 @@
  
  ####Change log####
  
+ v1.17: set T1 font encoding with utf-8 input, ensure LuaLaTeX compatibility; load hologo and metalogo packages; edit documentation.
+ 
  v1.16: remove xpatch and comment packages from class file; disable \\( and \\) in pdf bookmarks to avoid warnings; edit documentation.
  
  v1.15: correct extra space left by \\CorrespondingAuthor when that author is not last; correct breakage of \\ref in captions.  Thanks to Bret Van Poppel for reporting these issues.
@@ -94,7 +96,7 @@
  
  ####License####
 
- Copyright (c) 2019 John H. Lienhard
+ Copyright (c) 2020 John H. Lienhard
 
  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
  associated documentation files (the "Software"), to deal in the Software without restriction, 
diff --git a/macros/latex/contrib/asmeconf/asmeconf-template.pdf b/macros/latex/contrib/asmeconf/asmeconf-template.pdf
index 74cebad255..6e64eb32b9 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 542c090acd..4010bd1f0e 100644
--- a/macros/latex/contrib/asmeconf/asmeconf-template.tex
+++ b/macros/latex/contrib/asmeconf/asmeconf-template.tex
@@ -1,11 +1,12 @@
+% !TEX encoding = UTF-8 Unicode
 %% 
 %%  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.16 dated 2020/02/28.
+%%  This file is version 1.17 dated 2020/02/29
 %%  
-%%  As of version 1.11, this template follows ASME's newer conference guidelines posted in July 2019.
-%% 			The new guidelines have changed the requested author block formatting.
+%%  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 (old format is also supported)
 %%			Nomenclature now follows the abstract.  Abstract is in italics.
 %%
 %%  Author: John H. Lienhard V
@@ -83,9 +84,9 @@
 
 
 %% Class options are described above.
+
 \documentclass[varvw,largesc,upint,mathalfa=cal=euler,colorlinks,hyphenate,balance]{asmeconf} % <=== remove colorlinks for submission to ASME
 
-\pdfminorversion=7 % This selection is not required.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%   Fields to be completed   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -116,7 +117,7 @@
 
 % Units of measure and other specialty lowercase terms in the title should be 
 %   enclosed in \NoCaseChange{...} to maintain lower case type
-%   LaTeX will automatically set this in all capital letters.
+%   LaTeX will automatically set the title in all capital letters.
 
 \title{Place Title Here: Place Subtitle After Colon} % <=== change to YOUR title
  
@@ -130,7 +131,7 @@
 %%
 %%   \JointFirstAuthor, if applicable, follows the affiliation of the relevant authors, no spaces.
 
-\SetAuthors{Luis Hern\'{a}ndez\affil{1}\JointFirstAuthor , Maria Silva\affil{2}\JointFirstAuthor, Henry Tudor\affil{3},  Catherine~Parr\affil{3}, John H.\ Lienhard V\affil{4}\CorrespondingAuthor{lienhard@mit.edu}}
+\SetAuthors{Luis Hern\'andez\affil{1}\JointFirstAuthor , Maria Silva\affil{2}\JointFirstAuthor, Henry Tudor\affil{3},  Catherine~Parr\affil{3}, John H.\ Lienhard V\affil{4}\CorrespondingAuthor{lienhard@mit.edu}}
 
 \SetAffiliation{1}{Institution or Company Name, City, State}
 \SetAffiliation{2}{Institution or Company Name, City, Province, Canada}
@@ -157,7 +158,7 @@
 %%
 %% Abstract should be no more than 200 words
 \begin{abstract}
-This paper is an example and template for typesetting ASME Conference Papers in \LaTeX\  using the {\upshape\texttt{asmeconf}} class. This class follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of December 2019. The class is compatible with the {\upshape\texttt{hyperref}} package for producing pdf files with links.  The optional argument of \verb|\section| has been modified for manually setting pdf bookmarks when macros or complicated mathematics are included in section headings. The class is intended to be used with the {\upshape\texttt{asmeconf.bst}} \textsc{Bib}\negthinspace\TeX\ style, which is part of this distribution. The class may be invoked with several options, most of which address math fonts. The class calls a number of packages, all of which are in \TeX\ Live and on CTAN.
+This paper is an example and 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 compatible with the {\upshape\texttt{hyperref}} package for producing pdf files with links.  The optional argument of \verb|\section| has been modified for manually setting pdf bookmarks when macros or complicated mathematics are included in section headings. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style, which is part of this distribution. The class may be invoked with several options, most of which address 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) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -330,7 +331,7 @@ Landscape figures and tables may be produced at full-page size by putting \verb|
 
 Citations are automatically numbered \cite{ning2002}. They should be inserted at the appropriate point using a \verb|\cite{ref}| command~\cite{gibson2008,stevens1999}. The citations will be automatically sorted and compressed as well if they are given in a set \cite{stevens1999,ning2002,gibson2008,wions2005,smith2002,watson1982,smith1998}. See the \texttt{asmeconf-sample.bib} file for examples of how to enter your references. Citations and references are managed by the standard \texttt{natbib} package.
 
-The {\upshape\texttt{asmeconf.bst}} \textsc{Bib}\negthinspace\TeX\  style follows the reference styles posted on ASME's conference web site in early 2020. Examples for these and many other cases are given in the \texttt{asmeconf-sample.bib} file, which is part of this distribution.  Nevertheless, a few comments are necessary. 
+The {\upshape\texttt{asmeconf.bst}} \hologo{BibTeX}  style follows the reference styles posted on ASME's conference web site in early 2020. Examples for these and many other cases are given in the \texttt{asmeconf-sample.bib} file, which is part of this distribution.  Nevertheless, a few comments are necessary. 
 
 %% subsubsections are not numbered
 \subsubsection*{DOI, URL, and eprint} Include DOI numbers when they are available.  URL's may alternatively be given.
@@ -507,7 +508,7 @@ the option [\texttt{oldauthors}].  When using this form, the author names and ad
 \verb|\SetAuthorBlock{\CorrespondingAuthor{John Lienhard%|
  \hbox{}\hfil\verb|}{lienhard@mit.edu}}{Institution \\ City, State}|
 
-%% see after end document for usable code if you go this route.
+%% directly usable code follows \end{document}, below.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -519,11 +520,18 @@ as a secondary and tertiary language, \texttt{lang-second} and \texttt{lang-thir
 
 The standard caption and section names will follow \texttt{babel}'s dictionary for primary languages other than English.  Users may additionally change ``Keywords'', ``Nomenclature'',  ``Corresponding author'', and ``Joint first authors'' by renewing the commands \verb|\keywordname|, \verb|\nomname|, \verb|\CAwords|, and \verb|\JAwords|. Changes to the page footer were described earlier. The pdf bookmark for ``Appendices'' may be changed by renewing \verb|\appendicesname|.
 
-No effort has been made to support customization of language-specific fonts, although this is possible by modifying the class file (examples are given in the \texttt{newtx} documentation). The bibliography style, \texttt{asmeconf.bst}, is designed in English and aimed at \texttt{BibTeX}.  Multilingual bibliographies can be supported using \texttt{BibLaTeX}.
+Font encoding is set to T1 with utf-8 input supported: 
+%% If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.
+\typeout{If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.}
+àáâäæãåā  èéęëêēė  îïíīįì ôöòóœøōõ ûüùúū çćč ł ñń ßśš ÿ žźż.
+
+No effort has been made to support customization of language-specific fonts, although this is possible by modifying the class file (examples are given in the \texttt{newtx} documentation). The bibliography style, \texttt{asmeconf.bst}, is designed in English and aimed at \hologo{BibTeX}.  Multilingual bibliographies can be supported using \texttt{BibLaTeX}.
 
 \end{document}
 
 
+%%% This is the set-up for the old author block style, a grid of blocks.
+
 % 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.
diff --git a/macros/latex/contrib/asmeconf/asmeconf.cls b/macros/latex/contrib/asmeconf/asmeconf.cls
index 4f2d8f3d42..11cf01aba5 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.16 dated 2020/02/28.
-	\def\versionno{1.16}
-	\def\versiondate{2020/02/28\space}
+%%  This file is version 1.17 dated 2020/02/29.
+	\def\versionno{1.17}
+	\def\versiondate{2020/02/29\space}
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -190,7 +190,7 @@
 \RequirePackage{graphicx} 
 \RequirePackage[hyperref,fixpdftex,dvipsnames,svgnames,x11names]{xcolor}
 \RequirePackage{xparse} 
-%\RequirePackage{comment} % user may load this in preamble if desired.
+\RequirePackage{metalogo,hologo} % Access various LaTeX logos if needed
 
 %%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -202,8 +202,18 @@
 
 %%%% FONT related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\RequirePackage{mathtools} % extends amsmath
-\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+
+\RequirePackage{iftex} % check whether pdfTeX or a different engine is used
+\ifpdftex
+  \pdfminorversion=7 % This selection is not required.
+  \RequirePackage[utf8]{inputenc} % for backward compatibility with pre-2018 distributions
+\else
+  \relax
+\fi
+
+\RequirePackage{mathtools} % loads and extends amsmath
+
 \RequirePackage[]{babel}
 \RequirePackage[]{newtxtext}
 \RequirePackage[varqu,varl]{inconsolata} % sans typewriter font
@@ -213,8 +223,8 @@
 %% override \textsu if using default superiors
 \ifthenelse{\boolean{DefaultSups}}{\let\textsu\textsuperscript}{\relax}
 
-\RequirePackage[]{mathalfa} % load optional fonts for Calligraphy, Script, etc. 
-% See package documentation for capabilities of this package.
+\RequirePackage[]{mathalfa} % load optional fonts for Calligraphy, Script, Fraktur 
+% See mathalfa package documentation for capabilities of this package.
 % Option format:  mathalfa=cal=euler (etc.)
 
 \RequirePackage{bm} % load after all math to give access to bold math
@@ -360,7 +370,7 @@
 	
 \urlstyle{same}     % don't switch to typewriter font
 
-\RequirePackage{doi}          % provides line breaking for doi hyperlinks in bibliography
+\RequirePackage{doi}          % supports the nasty characters in some doi's
 \renewcommand{\doitext}{DOI } % change the default value, {doi:}, to this per ASME specification
 \RequirePackage{bookmark}     % improves handling of pdf bookmarks