CTAN sync 202001310301

4 files changed, 29 insertions, 12 deletions

diff --git a/fonts/modes/ChangeLog b/fonts/modes/ChangeLog
index d59acbdc71..68ff34200d 100644
--- a/fonts/modes/ChangeLog
+++ b/fonts/modes/ChangeLog
@@ -1,3 +1,11 @@
+2020-01-30  Karl Berry  <karl@freefriends.org>
+
+	* version 4.1.
+	
+	* modes.mf (mode_include_extra_info_available): new boolean,
+	so we can test for it using MF's known primitive in
+	mktextfm. known only works on primaries, not definitions.
+
 2020-01-28  Karl Berry  <karl@freefriends.org>
 
 	* version 4.0 (skipping 3.9).  First normal upload to CTAN.
@@ -516,3 +524,5 @@ Thu Jul 18 08:01:03 1991  Karl Berry  (karl at hayley)
 Sun Jul  7 09:19:08 1991  Karl Berry  (karl at hayley)
 
         * Version 0.5.
+
+(This file public domain.)
diff --git a/fonts/modes/GNUmakefile b/fonts/modes/GNUmakefile
index b7efb2baad..bcdc88586b 100644
--- a/fonts/modes/GNUmakefile
+++ b/fonts/modes/GNUmakefile
@@ -1,7 +1,7 @@
-# $Id: GNUmakefile,v 1.3 2020/01/28 19:13:52 karl Exp $
+# $Id: GNUmakefile,v 1.4 2020/01/30 16:59:00 karl Exp $
 # Makefile for the mode_def collection. Public domain.
 
-version = 4.0
+version = 4.1
 
 default: check
 
@@ -78,11 +78,12 @@ cmr10.300pk logo10.2540gf test.ps cmbsy7.1200gf
 # Check that Xerox info is included if requested. Must use -ini because
 # mf.base includes modes.mf by default, and it intentionally stops
 # itself from being read twice. So, for development convenience, do it
-# all by hand (instead of depending on modes.base and dumping a new one
-# every time).
+# all by hand (instead of depending on modes.base and dumping it anew
+# every time). The conditional here is exactly what mktextfm does.
 # 
-checkx:
-	-mf -ini '\input plain; nonstopmode; input modes; mode:=cx; mode_include_extra_info; input logo10'
+checkx cx:
+	rm -f plain.tfm
+	-mf -ini '\input plain; nonstopmode; input modes; mode:=cx; if known mode_include_extra_info_available: mode_include_extra_info fi; input logo10'
 	tftopl ./plain.tfm | fgrep CODING
 
 check-mktextfm:
diff --git a/fonts/modes/modes.mf b/fonts/modes/modes.mf
index d308608f1d..ac9cf66368 100644
--- a/fonts/modes/modes.mf
+++ b/fonts/modes/modes.mf
@@ -1,4 +1,4 @@
-% {\tt\catcode`\$=12 $Id: modes.mf,v 1.26 2020/01/28 19:14:12 karl Exp $ }
+% {\tt\catcode`\$=12 $Id: modes.mf,v 1.27 2020/01/30 16:58:51 karl Exp $ }
 %%\font\tenlogosl=logosl10
 %%\def\logofont{\ifdim\fontdimen1\font>0pt \tenlogosl\else\tenlogo\fi}
 %%\def\MF{{\logofont META}\-{\logofont FONT}}
@@ -48,11 +48,11 @@
 %%\begingroup \tt \catcode`\{=12 \catcode`\}=12 \obeyspaces
 % @mffile{
 %   author = "The Metafont community",
-%   version = "4.0",
-%   date = "Tue Jan 28 11:17:07 PST 2020"
+%   version = "4.1",
+%   date = "Thu Jan 30 08:59:07 PST 2020"
 %   filename = "modes.mf",
 %   email = "tex-fonts@math.utah.edu"
-%   checksum = "2621 13018 95640",
+%   checksum = "2627 13058 95921",
 %   codetable = "ISO/ASCII",
 %   supported = "yes",
 %   docstring = "
@@ -432,10 +432,10 @@
 
 % Don't let ourselves be processed twice.
 if known modes_mf: endinput; fi;
-modes_mf := 4.0;
+modes_mf := 4.1;
 
 % Identify ourselves in the format file.
-base_version := base_version & "/modes 4.0";
+base_version := base_version & "/modes 4.1";
 
 % Here are useful macros (also called definitions) we use throughout.
 
@@ -659,6 +659,12 @@ def mode_include_extra_info =
   let bye = end;
 enddef;
 
+% This is tested in {\tt mktextfm} with |known| to see if it is ok to\]
+% call |mode_include_extra_info|, since there is apparently no way to test\]
+% whether a macro is defined, unlike \TeX.\]
+boolean mode_include_extra_info_available;
+mode_include_extra_info_available := true;
+
 % Now make |end| and |bye| |outer| again; it seems |let| does not
 % restore this attribute.
 %
diff --git a/fonts/modes/modes.pdf b/fonts/modes/modes.pdf
index 1fa9fa297d..df22ff232a 100644
--- a/fonts/modes/modes.pdf
+++ b/fonts/modes/modes.pdf