CTAN sync 202201120300

4 files changed, 23 insertions, 19 deletions

diff --git a/fonts/zlmtt/README b/fonts/zlmtt/README
index d918d61ddc..261c11d7ca 100644
--- a/fonts/zlmtt/README
+++ b/fonts/zlmtt/README
@@ -4,7 +4,10 @@ This material is subject to the LaTeX Project Public License. See
 http://www.ctan.org/license/lppl1.3
 for the details of that license.
 
-Current version: 1.03
+Current version: 1.031
+
+Changes in version 1.031
+Code and documentation enhancements. (Thanks Maurice Hansen.)
 
 Changes in version 1.03
 Change in handling the detection of mweights code. (Thanks Maurice Hansen.)
diff --git a/fonts/zlmtt/doc/zlmtt-doc.pdf b/fonts/zlmtt/doc/zlmtt-doc.pdf
index 09006d2936..c3ff2c6f50 100644
--- a/fonts/zlmtt/doc/zlmtt-doc.pdf
+++ b/fonts/zlmtt/doc/zlmtt-doc.pdf
diff --git a/fonts/zlmtt/doc/zlmtt-doc.tex b/fonts/zlmtt/doc/zlmtt-doc.tex
index 42b367c686..7160e6d82e 100644
--- a/fonts/zlmtt/doc/zlmtt-doc.tex
+++ b/fonts/zlmtt/doc/zlmtt-doc.tex
@@ -5,12 +5,12 @@
 \usepackage{amssymb}% do not use with mtpro2 except lite version
 %SetFonts
 % fbb+newtxmath
-\usepackage[lining]{fbb}
+\usepackage[lining]{etbb}
 \usepackage[T1]{fontenc}
-\usepackage{textcomp}
+%\usepackage{textcomp}
 \usepackage[scaled=1.07]{zlmtt} % lmodern typewriter
 \usepackage{amsmath,amsthm}
-\usepackage[libertine,bigdelims]{newtxmath}
+\usepackage[libertine]{newtxmath}
 \useosf
 \linespread{1.05}
 %\usepackage[supstfm=libertinesups,%
@@ -55,7 +55,8 @@ The options you may use in loading this package are:
 {\tt med} (or just {\tt m}) makes \verb|\bfseries| render using ({\tt m}).
 \end{itemize}   
 \end{itemize}
-Note that the weight options depend on the {\tt mweights} package which was introduced in July $2013$.
+(The non-defaults weights are not available unless the package detects the code from the {\tt mweights} package is loaded. AS of LaTeX 2020-02-02 or newer, its code is buitl into the kernel. Those using prior versions of LaTeX will have to rely on the continuing presence of the actual {\tt mweights} package.)
+%Note that the weight options depend on the {\tt mweights} package which was introduced in July $2013$.
 
 The package defines two macros, \verb|\proptt| and \verb|\monott| that allow you to use proportional typewriter mode or monospace typewriter mode whether or not you selected the {\tt proportional} option. This document uses {\tt monospace} mode, but I can write \verb|\proptt{proportional spacing}| and get \proptt{proportional spacing}, or \verb|\textit{\proptt{proportionally spaced slanted}}| to get \textit{\proptt{proportionally spaced slanted}}. The macro \verb|\lctt| prints its argument in light-condensed weight, monospaced mode, and uses a slanted font if italic shape is in force. E.g., \verb|\lctt{light condensed}| produces \lctt{light condensed}, and \verb|\textit{\lctt{light condensed italic}}| produces \textit{\lctt{light condensed italic}}.
 
@@ -70,14 +71,14 @@ This package supports all the encodings supported by the {\tt lmodern} package.
 \end{verbatim}
 This document used the following font settings:
 \begin{verbatim}
-\usepackage[lining]{fbb} % free Bembo, lining figures in math mode
+\usepackage[lining]{etbb} % free Bembo, lining figures in math mode
 \usepackage[T1]{fontenc}
-\usepackage{textcomp}
+%\usepackage{textcomp}
 \usepackage[scaled=1.07]{zlmtt} % lmodern typewriter
 \usepackage{amsmath,amsthm}
-\usepackage[libertine,bigdelims]{newtxmath}
+\usepackage[libertine]{newtxmath}
 \useosf % oldstyle figures in text mode
-\linespread{1.05} % fbb has tall ascenders
+\linespread{1.05} % etbb has tall ascenders
 \end{verbatim}
 
 \end{document}  
\ No newline at end of file
diff --git a/fonts/zlmtt/tex/zlmtt.sty b/fonts/zlmtt/tex/zlmtt.sty
index b8e0d167c9..94c1706ad2 100644
--- a/fonts/zlmtt/tex/zlmtt.sty
+++ b/fonts/zlmtt/tex/zlmtt.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.03}
-\def\filedate{2021/12/21}
+\def\fileversion{1.031}
+\def\filedate{2022/01/10}
 \ProvidesPackage{zlmtt}[\filedate\space v\fileversion. Alternate support package for Latin Modern TypeWriter]
 % Load after every package that (re)defines \ttdefault.
 \renewcommand{\ttdefault}{zlmtt}
@@ -17,15 +17,15 @@
 %\IfFileExists{mweights.sty}{\RequirePackage{mweights}\@zlmtt@mwtrue%
 %}{}% allows choice of how to render medium, bold
 \RequirePackage{xkeyval}
+\def\mdseries@tt{m} % default mdseries is medium
+\def\bfseries@tt{b} % default bfseries is bold
 \if@zlmtt@mw
-  \edef\mdseries@tt{m} % default mdseries is medium
-  \edef\bfseries@tt{b} % default bfseries is bold
-  \DeclareOptionX{light}{\edef\mdseries@tt{l}}
-  \DeclareOptionX{l}{\edef\mdseries@tt{l}} % make mdseries mean l
-  \DeclareOptionX{lightcondensed}{\edef\mdseries@tt{lc}}
-  \DeclareOptionX{lc}{\edef\mdseries@tt{lc}}
-  \DeclareOptionX{med}{\edef\bfseries@tt{m}} % make bfseries mean m
-  \DeclareOptionX{m}{\edef\bfseries@tt{m}}
+  \DeclareOptionX{light}{\def\mdseries@tt{l}}
+  \DeclareOptionX{l}{\def\mdseries@tt{l}} % make mdseries mean l
+  \DeclareOptionX{lightcondensed}{\def\mdseries@tt{lc}}
+  \DeclareOptionX{lc}{\def\mdseries@tt{lc}}
+  \DeclareOptionX{med}{\def\bfseries@tt{m}} % make bfseries mean m
+  \DeclareOptionX{m}{\def\bfseries@tt{m}}
 \fi
 \DeclareOptionX{proportional}{%
   \renewcommand{\ttdefault}{zlmvtt}