14 files changed, 42 insertions, 37 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)
diff --git a/macros/latex/contrib/colortbl/colortbl-DE.pdf b/macros/latex/contrib/colortbl/colortbl-DE.pdf
index 83cd3c8589..5148eaecd3 100644
--- a/macros/latex/contrib/colortbl/colortbl-DE.pdf
+++ b/macros/latex/contrib/colortbl/colortbl-DE.pdf
diff --git a/macros/latex/contrib/colortbl/colortbl.dtx b/macros/latex/contrib/colortbl/colortbl.dtx
index 65c4b975b7..2816d576c2 100644
--- a/macros/latex/contrib/colortbl/colortbl.dtx
+++ b/macros/latex/contrib/colortbl/colortbl.dtx
@@ -1,7 +1,7 @@
 % \iffalse
 %%
 %% Source File: `colortbl.dtx'.
-%% Copyright 1996 1998 1999 2012 2018 David Carlisle
+%% Copyright 1996 1998 1999 2012 2018 2020 David Carlisle
 %%
 %% This file may be distributed under the terms of the LPPL.
 %% See readme for details.
@@ -15,7 +15,7 @@
 %<driver>\ProvidesFile{colortbl.drv}
 % \fi
 %         \ProvidesFile{colortbl.dtx}
-          [2018/12/12 v1.0d Color table columns (DPC)]
+          [2020/01/04 v1.0e Color table columns (DPC)]
 %
 % \iffalse
 %<*driver>
@@ -72,6 +72,7 @@
 % \changes{v0.1j}{2001/02/13}{\cs{cellcolor} (Donald Arseneau)}
 % \changes{v1.0c}{2018/05/02}{Updates to match new array code}
 % \changes{v1.0d}{2018/12/22}{Updates to match even newer array code}
+% \changes{v1.0e}{2020/01/04}{Updates to match updated hhline}
 %
 % \section{Introduction}
 %
@@ -1279,11 +1280,13 @@
        ##2%
       \global\setbox\@ne\HH@box\doublerulesep\doublerulesep}}%
        \HH@let!}\else
+  \ifx\@tempb\@sptoken\let\next\HH@spacelet\else
   \PackageWarning{hhline}%
       {\meaning\@tempb\space ignored in \noexpand\hhline argument%
        \MessageBreak}%
-  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
   \next}
+\lowercase{\def\HH@spacelet} {\futurelet\@tempb \HH@loop}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
diff --git a/macros/latex/contrib/colortbl/colortbl.pdf b/macros/latex/contrib/colortbl/colortbl.pdf
index 685037c86b..5d1174b694 100644
--- a/macros/latex/contrib/colortbl/colortbl.pdf
+++ b/macros/latex/contrib/colortbl/colortbl.pdf
diff --git a/macros/latex/contrib/fontspec/CHANGES.md b/macros/latex/contrib/fontspec/CHANGES.md
index 1f6b1d96c1..d65a8b1c01 100644
--- a/macros/latex/contrib/fontspec/CHANGES.md
+++ b/macros/latex/contrib/fontspec/CHANGES.md
@@ -1,6 +1,15 @@
 Change history
 ==============
 
+## v2.7g (2020/01/26)
+
+  * Fix regression that broke changing the default encoding after `fontspec` was loaded
+    (e.g., to use legacy fonts by default but use a `fontspec` font occassionally).
+  * Fix bug exhibited in `polyglossia` and perhaps elsewhere when `Script` is set without
+    a corresponding `Language`.
+  * Use `\familydefault` instead of `\rmdefault` when calculating scaling parameters in
+    `Scale=MatchLowercase` and `Scale=MatchUppercase`.
+
 ## v2.7f (2020/01/24)
 
   * Rename font feature `Letters=Uppercase` to `Style=Uppercase`, as this feature does
diff --git a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx b/macros/latex/contrib/fontspec/fontspec-code-internal.dtx
index d86f675dfa..432ae803f6 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx
+++ b/macros/latex/contrib/fontspec/fontspec-code-internal.dtx
@@ -925,26 +925,17 @@
   {
     \bool_if:NT \l_@@_ot_bool
       {
-        \tl_if_empty:NF \l_@@_script_tl
-          {
-            script   = \l_@@_script_tl ;
-            language = \l_@@_lang_tl   ;
-          }
+        \tl_if_empty:NF \l_@@_script_tl { script   = \l_@@_script_tl ; }
+        \tl_if_empty:NF \l_@@_lang_tl   { language = \l_@@_lang_tl   ; }
       }
   }
 %</XE>
 %<*LU>
   {
     mode     = \l_@@_mode_tl   ;
-    \tl_if_empty:NF \l_@@_shaper_tl
-      {
-        shaper = \l_@@_shaper_tl   ;
-      }
-    \tl_if_empty:NF \l_@@_script_tl
-      {
-        script   = \l_@@_script_tl ;
-        language = \l_@@_lang_tl   ;
-      }
+    \tl_if_empty:NF \l_@@_shaper_tl { shaper = \l_@@_shaper_tl   ; }
+    \tl_if_empty:NF \l_@@_script_tl { script   = \l_@@_script_tl ; }
+    \tl_if_empty:NF \l_@@_lang_tl   { language = \l_@@_lang_tl   ; }
   }
 %</LU>
 %    \end{macrocode}
diff --git a/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx b/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx
index 25c71c3400..b7e660da0c 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx
+++ b/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx
@@ -486,7 +486,7 @@
     \group_begin:
 
       \fontencoding { \encodingdefault }
-      \fontfamily { \rmdefault }
+      \fontfamily { \familydefault }
       \selectfont
 
       \@@_set_font_dimen:NnN \l_@@_tmpa_dim {#1} \font
diff --git a/macros/latex/contrib/fontspec/fontspec-code-user.dtx b/macros/latex/contrib/fontspec/fontspec-code-user.dtx
index e4ba3539d0..d235d0dbe9 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-user.dtx
+++ b/macros/latex/contrib/fontspec/fontspec-code-user.dtx
@@ -46,9 +46,9 @@
     \tl_replace_all:cnn { ttfamily~ } { \fontfamily }
       { \fontencoding \l_@@_ttfamily_encoding_tl \fontfamily }
   }
-\tl_set_eq:NN \l_@@_rmfamily_encoding_tl \g_fontspec_encoding_tl
-\tl_set_eq:NN \l_@@_sffamily_encoding_tl \g_fontspec_encoding_tl
-\tl_set_eq:NN \l_@@_ttfamily_encoding_tl \g_fontspec_encoding_tl
+\tl_set:Nn \l_@@_rmfamily_encoding_tl { \encodingdefault }
+\tl_set:Nn \l_@@_sffamily_encoding_tl { \encodingdefault }
+\tl_set:Nn \l_@@_ttfamily_encoding_tl { \encodingdefault }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/macros/latex/contrib/fontspec/fontspec-code.pdf b/macros/latex/contrib/fontspec/fontspec-code.pdf
index fca2c0af98..8982d35be2 100644
--- a/macros/latex/contrib/fontspec/fontspec-code.pdf
+++ b/macros/latex/contrib/fontspec/fontspec-code.pdf
diff --git a/macros/latex/contrib/fontspec/fontspec.dtx b/macros/latex/contrib/fontspec/fontspec.dtx
index 7e0232e989..826ad41cce 100644
--- a/macros/latex/contrib/fontspec/fontspec.dtx
+++ b/macros/latex/contrib/fontspec/fontspec.dtx
@@ -70,7 +70,7 @@
 \ProvidesExplFile{fontspec.dtx}
 %</dtx>
 %<*fontspec>
-  {2020/01/24}{2.7f}{Font selection for XeLaTeX and LuaLaTeX}
+  {2020/01/26}{2.7g}{Font selection for XeLaTeX and LuaLaTeX}
 %</fontspec>
 %    \end{macrocode}
 %
@@ -89,8 +89,8 @@
 %<lua>local fontspec    = fontspec
 %<lua>fontspec.module   = {
 %<lua>    name          = "fontspec",
-%<lua>    version       = "2.7f",
-%<lua>    date          = "2020/01/24",
+%<lua>    version       = "2.7g",
+%<lua>    date          = "2020/01/26",
 %<lua>    description   = "Font selection for XeLaTeX and LuaLaTeX",
 %<lua>    author        = "Khaled Hosny, Philipp Gesang, Will Robertson",
 %<lua>    copyright     = "Khaled Hosny, Philipp Gesang, Will Robertson",
diff --git a/macros/latex/contrib/fontspec/fontspec.pdf b/macros/latex/contrib/fontspec/fontspec.pdf
index 193b3234f8..b64f441771 100644
--- a/macros/latex/contrib/fontspec/fontspec.pdf
+++ b/macros/latex/contrib/fontspec/fontspec.pdf