lwarp (1feb20)

git-svn-id: svn://tug.org/texlive/trunk@53632 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 36 insertions, 16 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
index 2ccc1fa5bd0..f90499f9161 100755
--- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
+++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
@@ -1,8 +1,8 @@
 #!/usr/bin/env texlua
 
--- Copyright 2016-2019 Brian Dunn
+-- Copyright 2016-2020 Brian Dunn
 
-printversion = "v0.78"
+printversion = "v0.79"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -699,7 +699,7 @@ else -- not --version
 
 -- print intro:
 
-print ("lwarpmk: " .. printversion .. "  Automated make for the LaTeX lwarp package.")
+print ("lwarpmk: " .. printversion .. "  Automated make for the LaTeX Lwarp package.")
 
 -- lwarpmk print:
 
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/mktexpk b/Build/source/texk/texlive/linked_scripts/texlive/mktexpk
index 2b06f38a89d..f185c933c6d 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/mktexpk
+++ b/Build/source/texk/texlive/linked_scripts/texlive/mktexpk
@@ -7,7 +7,7 @@
 # Originally written by Thomas Esser, Karl Berry, and Olaf Weber.
 # Public domain.
 
-version='$Id: mktexpk 53254 2019-12-29 19:18:55Z karl $'
+version='$Id: mktexpk 53602 2020-01-30 22:18:33Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 # preferentially use subprograms from our own directory.
@@ -20,7 +20,7 @@ usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
 
 --dpi DPI           use resolution DPI.
 --bdpi BDPI         use base resolution BDPI.
---mag MAG           use magnificiation MAG.
+--mag MAG           use magnification MAG.
 --mfmode MODE       use MODE as the METAFONT mode.
 --destdir DESTDIR   write fonts in DESTDIR.
 
@@ -35,15 +35,15 @@ newly created pk file.
 
 If you expected the font to be available as an outline, and thus this
 script does not work and should not have been called, most likely the
-font's .tfm name is missing from the relevant map file (e.g.,
-psfonts.map for dvips, pdftex.map for pdftex).  These map files are
-typically maintained using updmap; q.v.
+font's .tfm name is missing from the relevant map file (i.e.,
+psfonts.map for dvips-syntax programs, pdftex.map for pdftex-syntax
+programs).  These map files are typically maintained using updmap; q.v.
 
 For step-by-step instructions on making new fonts known to TeX, see
-http://tug.org/fonts/fontinstall.html.
+https://tug.org/fonts/fontinstall.html.
 
 Report bugs to: tex-k@tug.org
-TeX Live home page: <http://tug.org/texlive/>
+TeX Live home page: <https://tug.org/texlive/>
 "
 
 # Handle non-positional options, except for --version/--help
@@ -144,7 +144,7 @@ if kpsewhich $NAME.mf >/dev/null 2>&1 || mktexmf $NAME >/dev/null 2>&1; then
     8000) MODE=dpdfezzz;;
        *) echo "$progname: Can't guess mode for $BDPI dpi devices." >&2
           echo "$progname: Use a config file or option to specify the mode; see:" >&2
-          echo "$progname: http://tug.org/texinfohtml/kpathsea.html#Unable-to-generate-fonts" >&2
+          echo "$progname: https://tug.org/texinfohtml/kpathsea.html#Unable-to-generate-fonts" >&2
           exit 1
     esac
   fi
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/mktextfm b/Build/source/texk/texlive/linked_scripts/texlive/mktextfm
index 97d22939758..25ca508918b 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/mktextfm
+++ b/Build/source/texk/texlive/linked_scripts/texlive/mktextfm
@@ -7,7 +7,7 @@
 # Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
 # Public domain.
 
-version='$Id: mktextfm 53254 2019-12-29 19:18:55Z karl $'
+version='$Id: mktextfm 53602 2020-01-30 22:18:33Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 # preferentially use subprograms from our own directory.
@@ -21,15 +21,22 @@ Makes a TFM file for FONT, if possible. Use DESTDIR for the root of where
 to install into, either the absolute directory name to use (if it starts
 with a /) or relative to the default DESTDIR (if not).
 
+See the mktexpk and updmap help messages for more general information on
+making fonts available.
+
+If the environment variable MF_MODE_EXTRA_INFO is non-empty, the
+codingscheme and other so-called Xerox-world information will be
+included in the tfm file.
+
 Report bugs to: tex-k@tug.org
-TeX Live home page: <http://tug.org/texlive/>
+TeX Live home page: <https://tug.org/texlive/>
 "
 
 # Handle non-positional options, except for --version/--help
 while test $# -gt 0; do
   case "$1" in
-    --destdir) shift; DEST="$1"; shift ;;
-    --destdir=*) DEST=`echo "$1" | sed 's/--destdir=//'`; shift ;;
+    --destdir|-destdir) shift; DEST="$1"; shift ;;
+    --destdir=*|-destdir=*) DEST=`echo "$1" | sed 's/--*destdir=//'`; shift ;;
     --version|-version) break ;;
     --help|-help) break ;;
     *) break ;;
@@ -99,7 +106,20 @@ else
     MF=mf
   fi
 
-  cmd="$MF \mode:=$MODE; mag:=$MAG; nonstopmode; input $NAME"
+  # The idea here is to provide a programmatic way to get the
+  # codingscheme and other so-called Xerox-world information into the
+  # tfm: if the envvar MF_MODE_EXTRA_INFO is set, then modes.mf (as of
+  # the 3.9 release in January 2020) will arrange for that.  We do not
+  # do this by default because Knuth objected.
+  #
+  if test -n "$MF_MODE_EXTRA_INFO"; then
+    mf_extra_info="if known mode_include_extra_info_available: "
+    mf_extra_info="$mf_extra_info mode_include_extra_info fi"
+   else
+   mf_extra_info=""
+  fi
+  
+  cmd="$MF \mode:=$MODE; mag:=$MAG; $mf_extra_info; nonstopmode; input $NAME"
 fi
 
 echo "$progname: Running $cmd"