dviout-util: sync with upstream

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

4 files changed, 69 insertions, 16 deletions

diff --git a/Build/source/texk/dviout-util/ChangeLog b/Build/source/texk/dviout-util/ChangeLog
index 9bbc045a6c6..42b9a76e906 100644
--- a/Build/source/texk/dviout-util/ChangeLog
+++ b/Build/source/texk/dviout-util/ChangeLog
@@ -1,3 +1,16 @@
+2020-01-17  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* configure.ac: Version 20200117.
+
+2019-11-16  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* chkdvifont.c: Add -v option for more verbosity.
+	For now, only the parameter table of TFM/OFM is dumped.
+
+2019-08-27  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* chkdvifont.c: Show FONTDIR of OFM format.
+
 2019-02-25  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* chkdvifont.c: Forbid too long file name.
diff --git a/Build/source/texk/dviout-util/chkdvifont.c b/Build/source/texk/dviout-util/chkdvifont.c
index 42515bb1d6b..1453490e546 100644
--- a/Build/source/texk/dviout-util/chkdvifont.c
+++ b/Build/source/texk/dviout-util/chkdvifont.c
@@ -226,6 +226,7 @@ struct FONT_ATR font;
 struct VFFONT_ATR vffont;
 
 int f_v = -1;   /* verbose mode */
+int f_vv = 0;   /* more verbose mode */
 int f_d;        /* ignore default data */
 int f_t;        /* file_type */
 int n_data;     /* number of font_data */
@@ -301,6 +302,9 @@ int main(int argc, char **argv)
           case 'c':
               f_v = 1;
               break;
+          case 'v':
+              f_vv = 1;
+              break;
           case 'F':
               f_d = 1;
           case 'f':
@@ -316,7 +320,8 @@ int main(int argc, char **argv)
               f_t = 2;
               break;
           default:
-              usage();
+              fprintf(stderr, "Unknown option: %s\n", argv[i]);
+              exit(1);
         }
     }
 
@@ -945,10 +950,10 @@ void tfm_define(FILE * fp)
     fclose(fp);
 
     if (f_v != 0) {
-        if (ch == 'o')
+        if (ch == 'o') {
             printf("\t\"%s\" is a %cfm level %d file :%3ld  -> %3ld\n",
                 font.n, ch, tfmver, bc, ec);
-        else {
+        } else {
             printf("\t\"%s\" is a %cfm%s file :%3ld  -> %3ld\n",
                 font.n, ch, u, bc, ec);
             if (ch == 'j' && tfmver > 0) {
@@ -958,6 +963,40 @@ void tfm_define(FILE * fp)
                 if (tfmver & 4) printf("\t\t+ rearrangement in glue_kern\n");
             }
         }
+        if (f_vv > 0) {
+            printf("\t\tPARAMETERS:\n");
+            if (ch == 'j')
+                printf("\t\t  nt: %5d\n", nt);
+            printf("\t\t  lh: %5ld\n", lh);
+            printf("\t\t  bc: %5ld\n", bc);
+            printf("\t\t  ec: %5ld\n", ec);
+            printf("\t\t  nw: %5ld\n", nw);
+            printf("\t\t  nh: %5ld\n", nh);
+            printf("\t\t  nd: %5ld\n", nd);
+            printf("\t\t  ni: %5ld\n", ni);
+            printf("\t\t  nl: %5ld\n", nl);
+            printf("\t\t  nk: %5ld\n", nk);
+            if (ch == 'j')
+                printf("\t\t  ng: %5ld\n", ne); /* ng */
+            else
+                printf("\t\t  ne: %5ld\n", ne);
+            printf("\t\t  np: %5ld\n", np);
+            if (ch == 'o') {
+                printf("\t\t+ FONTDIR: ");
+                switch (fontdir) {
+                  case 0: printf("TL (default)"); break;
+                  case 1: printf("LT"); break;
+                  case 2: printf("TR"); break;
+                  case 3: printf("LB"); break;
+                  case 4: printf("BL"); break;
+                  case 5: printf("RT"); break;
+                  case 6: printf("BR"); break;
+                  case 7: printf("RB"); break;
+                  default: printf("unknown");
+                }
+                printf("\n");
+            }
+        }
     }
     check_font();
 }
@@ -1276,6 +1315,7 @@ void usage()
         "       chkdvifont [-s] [-c] [-{f|F}<font_data_file>] [-p] font_file_name\n\n"
         "Option\t -c: check mode\n"
         "\t -s: silent check mode\n"
+        "\t -v: more verbose (only for TFM/OFM mode)\n"
         "\t -f: use font_data_file (-F: and ignore default data)\n"
         "\t -d: force DVI mode\n"
         "\t -t: force TFM/OFM mode\n"
diff --git a/Build/source/texk/dviout-util/configure b/Build/source/texk/dviout-util/configure
index 1a52a6272eb..e679ae02785 100755
--- a/Build/source/texk/dviout-util/configure
+++ b/Build/source/texk/dviout-util/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dviout-util (TeX Live) 20190206.
+# Generated by GNU Autoconf 2.69 for dviout-util (TeX Live) 20200117.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dviout-util (TeX Live)'
 PACKAGE_TARNAME='dviout-util--tex-live-'
-PACKAGE_VERSION='20190206'
-PACKAGE_STRING='dviout-util (TeX Live) 20190206'
+PACKAGE_VERSION='20200117'
+PACKAGE_STRING='dviout-util (TeX Live) 20200117'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1332,7 +1332,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dviout-util (TeX Live) 20190206 to adapt to many kinds of systems.
+\`configure' configures dviout-util (TeX Live) 20200117 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1403,7 +1403,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dviout-util (TeX Live) 20190206:";;
+     short | recursive ) echo "Configuration of dviout-util (TeX Live) 20200117:";;
    esac
   cat <<\_ACEOF
 
@@ -1524,7 +1524,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dviout-util (TeX Live) configure 20190206
+dviout-util (TeX Live) configure 20200117
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2180,7 +2180,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dviout-util (TeX Live) $as_me 20190206, which was
+It was created by dviout-util (TeX Live) $as_me 20200117, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7867,7 +7867,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dviout-util--tex-live-'
- VERSION='20190206'
+ VERSION='20200117'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13893,7 +13893,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dviout-util (TeX Live) config.lt 20190206
+dviout-util (TeX Live) config.lt 20200117
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15502,7 +15502,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dviout-util (TeX Live) $as_me 20190206, which was
+This file was extended by dviout-util (TeX Live) $as_me 20200117, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15568,7 +15568,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dviout-util (TeX Live) config.status 20190206
+dviout-util (TeX Live) config.status 20200117
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dviout-util/configure.ac b/Build/source/texk/dviout-util/configure.ac
index bc3b8746bcc..71566ee671b 100644
--- a/Build/source/texk/dviout-util/configure.ac
+++ b/Build/source/texk/dviout-util/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2018 Japanese TeX Development Community <issue@texjp.org>
+dnl Copyright 2018-2020 Japanese TeX Development Community <issue@texjp.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([dviout-util (TeX Live)], [20190206], [tex-k@tug.org])
+AC_INIT([dviout-util (TeX Live)], [20200117], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvispc.c])
 AC_CONFIG_AUX_DIR([../../build-aux])