32 files changed, 206 insertions, 160 deletions
diff --git a/Build/source/utils/README b/Build/source/utils/README
index 7d00cc1529a..97ec85b5ad0 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -25,7 +25,7 @@ psutils p17 - checked 10may12
   -> http://www.connochaetos.org/misc/psutils-libre-1.17.tar.gz
   (Fabrice made small modifications for Windows, it seems)
 
-t1utils 1.37 - checked 10may12
+t1utils 1.38 - checked 3oct13
   http://www.lcdf.org/type/
 
 texdoctk - reluctantly maintained here in TL
diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog
index 0d91319a3a6..607519d0ca4 100644
--- a/Build/source/utils/t1utils/ChangeLog
+++ b/Build/source/utils/t1utils/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import t1utils-1.38.
+	* version.ac: Adjust.
+
 2013-01-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Allow subdir-objects.
diff --git a/Build/source/utils/t1utils/configure b/Build/source/utils/t1utils/configure
index 6f5fc60187b..179aecfaf8e 100755
--- a/Build/source/utils/t1utils/configure
+++ b/Build/source/utils/t1utils/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for t1utils (TeX Live) 1.37.
+# Generated by GNU Autoconf 2.69 for t1utils (TeX Live) 1.38.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,12 +580,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='t1utils (TeX Live)'
 PACKAGE_TARNAME='t1utils--tex-live-'
-PACKAGE_VERSION='1.37'
-PACKAGE_STRING='t1utils (TeX Live) 1.37'
+PACKAGE_VERSION='1.38'
+PACKAGE_STRING='t1utils (TeX Live) 1.38'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="t1utils-1.37/t1ascii.c"
+ac_unique_file="t1utils-1.38/t1ascii.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1273,7 +1273,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 t1utils (TeX Live) 1.37 to adapt to many kinds of systems.
+\`configure' configures t1utils (TeX Live) 1.38 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1340,7 +1340,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of t1utils (TeX Live) 1.37:";;
+     short | recursive ) echo "Configuration of t1utils (TeX Live) 1.38:";;
    esac
   cat <<\_ACEOF
 
@@ -1437,7 +1437,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-t1utils (TeX Live) configure 1.37
+t1utils (TeX Live) configure 1.38
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2043,7 +2043,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 t1utils (TeX Live) $as_me 1.37, which was
+It was created by t1utils (TeX Live) $as_me 1.38, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3966,7 +3966,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='t1utils--tex-live-'
- VERSION='1.37'
+ VERSION='1.38'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5613,7 +5613,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-T1UTILS_TREE=t1utils-1.37
+T1UTILS_TREE=t1utils-1.38
 
 
 
@@ -6157,7 +6157,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 t1utils (TeX Live) $as_me 1.37, which was
+This file was extended by t1utils (TeX Live) $as_me 1.38, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6223,7 +6223,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="\\
-t1utils (TeX Live) config.status 1.37
+t1utils (TeX Live) config.status 1.38
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/utils/t1utils/t1utils-1.37-PATCHES/ChangeLog b/Build/source/utils/t1utils/t1utils-1.38-PATCHES/ChangeLog
index 61ac3921ac6..ad9733e9c8e 100644
--- a/Build/source/utils/t1utils/t1utils-1.37-PATCHES/ChangeLog
+++ b/Build/source/utils/t1utils/t1utils-1.38-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import t1utils-1.38.
+	* patch-03-warnings, patch-04-TL-binary: Adapted.	
+
 2012-08-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-04-TL-binary (new): Use binary mode for output files.
diff --git a/Build/source/utils/t1utils/t1utils-1.37-PATCHES/TL-Changes b/Build/source/utils/t1utils/t1utils-1.38-PATCHES/TL-Changes
index dbe6169b203..88dea3a98b4 100644
--- a/Build/source/utils/t1utils/t1utils-1.37-PATCHES/TL-Changes
+++ b/Build/source/utils/t1utils/t1utils-1.38-PATCHES/TL-Changes
@@ -1,16 +1,16 @@
-Changes applied to the t1utils-1.37 tree as obtained from:
+Changes applied to the t1utils-1.38 tree as obtained from:
 	http://www.lcdf.org/type/
 
 Removed:
 	Makefile.in
 	aclocal.m4
+	compile
 	config.guess
 	config.sub
 	configure
 	depcomp
 	install-sh
 	missing
-	mkinstalldirs
 
 Moved this file to ../:
 	strerror.c
diff --git a/Build/source/utils/t1utils/t1utils-1.37-PATCHES/patch-03-warnings b/Build/source/utils/t1utils/t1utils-1.38-PATCHES/patch-03-warnings
index ccbbfcc2da3..715505bdf42 100644
--- a/Build/source/utils/t1utils/t1utils-1.37-PATCHES/patch-03-warnings
+++ b/Build/source/utils/t1utils/t1utils-1.38-PATCHES/patch-03-warnings
@@ -1,9 +1,9 @@
 	Avoid compiler warnings (gcc's -Wcast-qual).
 
-diff -ur t1utils-1.37.orig/clp.c t1utils-1.37/clp.c
---- t1utils-1.37.orig/clp.c	2011-04-04 16:47:48.000000000 +0200
-+++ t1utils-1.37/clp.c	2011-07-20 18:22:17.000000000 +0200
-@@ -1074,21 +1074,27 @@
+diff -ur t1utils-1.38.orig/clp.c t1utils-1.38/clp.c
+--- t1utils-1.38.orig/clp.c	2013-09-29 15:23:22.000000000 +0200
++++ t1utils-1.38/clp.c	2013-10-03 13:53:56.000000000 +0200
+@@ -1075,21 +1075,27 @@
  parse_int(Clp_Parser *clp, const char *arg, int complain, void *user_data)
  {
      const char *val;
@@ -36,7 +36,7 @@ diff -ur t1utils-1.37.orig/clp.c t1utils-1.37/clp.c
      if (*arg != 0 && *val == 0)
  	return 1;
      else if (complain) {
-@@ -1104,11 +1110,14 @@
+@@ -1105,11 +1111,14 @@
  parse_double(Clp_Parser *clp, const char *arg, int complain, void *user_data)
  {
      const char *val;
@@ -53,10 +53,10 @@ diff -ur t1utils-1.37.orig/clp.c t1utils-1.37/clp.c
      if (*arg != 0 && *val == 0)
  	return 1;
      else if (complain)
-diff -ur t1utils-1.37.orig/t1disasm.c t1utils-1.37/t1disasm.c
---- t1utils-1.37.orig/t1disasm.c	2011-04-04 16:47:49.000000000 +0200
-+++ t1utils-1.37/t1disasm.c	2011-07-20 18:22:17.000000000 +0200
-@@ -332,11 +332,11 @@
+diff -ur t1utils-1.38.orig/t1disasm.c t1utils-1.38/t1disasm.c
+--- t1utils-1.38.orig/t1disasm.c	2013-09-29 15:33:53.000000000 +0200
++++ t1utils-1.38/t1disasm.c	2013-10-03 13:53:56.000000000 +0200
+@@ -341,11 +341,11 @@
  /* 23.Feb.2004 - use 'memstr', not strstr, because the strings input to
     eexec_line aren't null terminated! Reported by Werner Lemberg. */
  
@@ -72,7 +72,7 @@ diff -ur t1utils-1.37.orig/t1disasm.c t1utils-1.37/t1disasm.c
      while (line < last
  	   && (try = memchr(line, (unsigned char)*pattern, last - line))) {
  	if (memcmp(try, pattern, pattern_len) == 0)
-@@ -432,7 +432,7 @@
+@@ -440,7 +440,7 @@
         badly: a charstring definition follows "/Charstrings ... begin", ON THE
         SAME LINE. */
      {
diff --git a/Build/source/utils/t1utils/t1utils-1.37-PATCHES/patch-04-TL-binary b/Build/source/utils/t1utils/t1utils-1.38-PATCHES/patch-04-TL-binary
index 6f0f32ff281..9cd7584db41 100644
--- a/Build/source/utils/t1utils/t1utils-1.37-PATCHES/patch-04-TL-binary
+++ b/Build/source/utils/t1utils/t1utils-1.38-PATCHES/patch-04-TL-binary
@@ -1,9 +1,9 @@
 	In TeX Live we treat all output files as binary.
 
-diff -ur t1utils-1.37.orig/t1ascii.c t1utils-1.37/t1ascii.c
---- t1utils-1.37.orig/t1ascii.c	2011-04-04 16:47:49.000000000 +0200
-+++ t1utils-1.37/t1ascii.c	2012-08-12 13:07:47.000000000 +0200
-@@ -281,6 +281,7 @@
+diff -ur t1utils-1.38.orig/t1ascii.c t1utils-1.38/t1ascii.c
+--- t1utils-1.38.orig/t1ascii.c	2013-09-29 15:23:22.000000000 +0200
++++ t1utils-1.38/t1ascii.c	2013-10-03 14:01:47.000000000 +0200
+@@ -284,6 +284,7 @@
    /* As we are processing a PFB (binary) input */
    /* file, we must set its file mode to binary. */
    _setmode(_fileno(ifp), _O_BINARY);
@@ -11,10 +11,10 @@ diff -ur t1utils-1.37.orig/t1ascii.c t1utils-1.37/t1ascii.c
  #endif
  
    /* prepare font reader */
-diff -ur t1utils-1.37.orig/t1disasm.c t1utils-1.37/t1disasm.c
---- t1utils-1.37.orig/t1disasm.c	2011-07-20 18:22:17.000000000 +0200
-+++ t1utils-1.37/t1disasm.c	2012-08-12 13:08:15.000000000 +0200
-@@ -747,6 +747,7 @@
+diff -ur t1utils-1.38.orig/t1disasm.c t1utils-1.38/t1disasm.c
+--- t1utils-1.38.orig/t1disasm.c	2013-10-03 13:53:56.000000000 +0200
++++ t1utils-1.38/t1disasm.c	2013-10-03 14:02:25.000000000 +0200
+@@ -754,6 +754,7 @@
    /* As we might be processing a PFB (binary) input file, we must set its file
       mode to binary. */
    _setmode(_fileno(ifp), _O_BINARY);
@@ -22,10 +22,10 @@ diff -ur t1utils-1.37.orig/t1disasm.c t1utils-1.37/t1disasm.c
  #endif
  
    /* prepare font reader */
-diff -ur t1utils-1.37.orig/t1unmac.c t1utils-1.37/t1unmac.c
---- t1utils-1.37.orig/t1unmac.c	2011-04-04 16:47:49.000000000 +0200
-+++ t1utils-1.37/t1unmac.c	2012-08-12 13:23:32.000000000 +0200
-@@ -651,8 +651,7 @@
+diff -ur t1utils-1.38.orig/t1unmac.c t1utils-1.38/t1unmac.c
+--- t1utils-1.38.orig/t1unmac.c	2013-09-29 15:23:22.000000000 +0200
++++ t1utils-1.38/t1unmac.c	2013-10-03 14:01:08.000000000 +0200
+@@ -654,8 +654,7 @@
    _setmode(_fileno(ifp), _O_BINARY);
    /* If we are processing a PFB (binary) output */
    /* file, we must set its file mode to binary. */
diff --git a/Build/source/utils/t1utils/t1utils-1.37/INSTALL b/Build/source/utils/t1utils/t1utils-1.38/INSTALL
index 95d84c820fb..95d84c820fb 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/INSTALL
+++ b/Build/source/utils/t1utils/t1utils-1.38/INSTALL
diff --git a/Build/source/utils/t1utils/t1utils-1.37/Makefile.am b/Build/source/utils/t1utils/t1utils-1.38/Makefile.am
index b294bea08ed..b294bea08ed 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/Makefile.am
+++ b/Build/source/utils/t1utils/t1utils-1.38/Makefile.am
diff --git a/Build/source/utils/t1utils/t1utils-1.37/NEWS b/Build/source/utils/t1utils/t1utils-1.38/NEWS
index 783015e136f..4853e0585a1 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/NEWS
+++ b/Build/source/utils/t1utils/t1utils-1.38/NEWS
@@ -1,5 +1,11 @@
 T1utils NEWS
 
+Version 1.38   29.Sep.2013
+
+* t1disasm: Fix an infinite loop on some fonts reported by Niels
+  Thykier.
+
+
 Version 1.37   29.Jun.2011
 
 * t1asm: Use a dynamically allocated buffer to handle huge characters
diff --git a/Build/source/utils/t1utils/t1utils-1.37/README b/Build/source/utils/t1utils/t1utils-1.38/README
index 27877155a81..803b1ac7ee7 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/README
+++ b/Build/source/utils/t1utils/t1utils-1.38/README
@@ -1,31 +1,12 @@
-T1UTILS VERSION 1.37 NOTES
-==========================
+T1UTILS
+=======
 
-   You need an ANSI C compiler, such as gcc.
-
-   Just type `./configure', then `make'. `make install' will build and
-install the utilities and their manual pages.
-
-   `./configure' accepts the usual options. See `INSTALL' for more
-details. The most commonly used option is `--prefix', which can be used
-to install the utilities in a place other than /usr/local.
-
-   Changes since version 1.2 (c) 1998-2008 Eddie Kohler, under the same
-redistribution copyright as I. Lee Hetherington's. See below for I. Lee
-Hetherington's original README from 1992, updated slightly for today's
-t1utils.
-
-Eddie Kohler
-ekohler@gmail.com
-
-####################################################################
-
-t1utils is a collection of simple type-1 font manipulation programs.
-Together, they allow you to convert between PFA (ASCII) and PFB (binary)
-formats, disassemble PFA or PFB files into human-readable form, reassemble
-them into PFA or PFB format. Additionally you can extract font resources
-from a Macintosh font file (ATM/Laserwriter), or create a Macintosh Type 1
-font file from a PFA or PFB font.
+   t1utils is a collection of simple type-1 font manipulation
+programs. Together, they allow you to convert between PFA (ASCII) and
+PFB (binary) formats, disassemble PFA or PFB files into human-readable
+form, reassemble them into PFA or PFB format. Additionally you can
+extract font resources from a Macintosh font file or create a
+Macintosh Type 1 font file from a PFA or PFB font.
 
 There are currently six programs:
 
@@ -57,25 +38,32 @@ t1mac		creates a Macintosh Type 1 file from a PFA or PFB-format
 		containing bitmap fonts if you do not have such a suitcase
 		for the font already. T1utils cannot help you do this.
 
-...
+Installation
+------------
 
-Thanks to Kai-Uwe Herbing (herbing@netmbx.netmbx.de) for the MS-DOS
-port (Microsoft C/C++ compiler).
+   You need an ANSI C compiler, such as gcc.
 
-The copyright on all of the tools in t1utils looks like:
+   Just type `./configure', then `make'. `make install' will build and
+install the utilities and their manual pages.
 
-	Copyright (c) 1992 by I. Lee Hetherington, all rights
-	reserved.
-	
-	Permission is hereby granted to use, modify, and distribute
-	this program for any purpose provided this copyright notice
-	and the one below remain intact.
+   `./configure' accepts the usual options. See `INSTALL' for more
+details. The most commonly used option is `--prefix', which can be used
+to install the utilities in a place other than /usr/local.
 
-Note that these tools should not be used to illegally copy type-1 font
-programs.  Typeface design is an intricate art that should be
+Copyright and license
+---------------------
+
+   The original t1utils were (c) 1992 I. Lee Hetherington. Changes
+since version 1.2 are (c) 1998-2013 Eddie Kohler. Distribution is
+under the Click LICENSE, a BSD-like license described in the LICENSE
+file in this directory.
+
+   Note that these tools should not be used to illegally copy type-1
+font programs. Typeface design is an intricate art that should be
 rewarded.
 
+Eddie Kohler
+ekohler@gmail.com
+
 I. Lee Hetherington
 ilh@lcs.mit.edu
-
-####################################################################
diff --git a/Build/source/utils/t1utils/t1utils-1.37/clp.c b/Build/source/utils/t1utils/t1utils-1.38/clp.c
index ce9cfc66325..3dff115733b 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/clp.c
+++ b/Build/source/utils/t1utils/t1utils-1.38/clp.c
@@ -2,7 +2,7 @@
 /* clp.c - Complete source code for CLP.
  * This file is part of CLP, the command line parser package.
  *
- * Copyright (c) 1997-2011 Eddie Kohler, ekohler@gmail.com
+ * Copyright (c) 1997-2012 Eddie Kohler, ekohler@gmail.com
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -476,6 +476,7 @@ Clp_NewParser(int argc, const char * const *argv, int nopt, const Clp_Option *op
     if (!clp || !cli || !iopt || !cli->valtype)
 	goto failed;
 
+    clp->opt = -1;
     clp->negated = 0;
     clp->have_val = 0;
     clp->vstr = 0;
@@ -1184,15 +1185,18 @@ parse_string_list(Clp_Parser *clp, const char *arg, int complain, void *user_dat
     }
 
     if (complain) {
-	const char *complaint = (ambiguous ? "ambiguous" : "invalid");
-	if (!ambiguous) {
+	const char *complaint;
+	if (ambiguous)
+	    complaint = "ambiguous value %<%s%> for option %<%O%>";
+	else {
+	    complaint = "unknown value %<%s%> for option %<%O%>";
 	    ambiguous = sl->nitems_invalid_report;
 	    for (idx = 0; idx < ambiguous; idx++)
 		ambiguous_values[idx] = idx;
 	}
 	return ambiguity_error
 	    (clp, ambiguous, ambiguous_values, sl->items, sl->iopt,
-	     "", "option %<%O%> value %<%s%> is %s", arg, complaint);
+	     "", complaint, arg);
     } else
 	return 0;
 }
@@ -1829,7 +1833,8 @@ Clp_Next(Clp_Parser *clp)
     /* Get the next argument or option */
     if (!next_argument(clp, cli->option_processing ? 0 : 2)) {
 	clp->val.s = clp->vstr;
-	return clp->have_val ? Clp_NotOption : Clp_Done;
+	clp->opt = clp->have_val ? Clp_NotOption : Clp_Done;
+	return clp->opt;
     }
 
     clp->negated = cli->whole_negated;
@@ -1867,7 +1872,7 @@ Clp_Next(Clp_Parser *clp)
 	    Clp_OptionError(clp, "unrecognized option %<%s%s%>",
 			    cli->option_chars, cli->xtext);
 
-	return Clp_BadOption;
+	return (clp->opt = Clp_BadOption);
     }
 
     /* Set the current option */
@@ -1880,19 +1885,20 @@ Clp_Next(Clp_Parser *clp)
 	|| (!cli->iopt[optno].imandatory && !cli->iopt[optno].ioptional)) {
 	if (clp->have_val) {
 	    Clp_OptionError(clp, "%<%O%> can%,t take an argument");
-	    return Clp_BadOption;
+	    clp->opt = Clp_BadOption;
 	} else
-	    return cli->opt[optno].option_id;
+	    clp->opt = cli->opt[optno].option_id;
+	return clp->opt;
     }
 
     /* Get an argument if we need one, or if it's optional */
     /* Sanity-check the argument type. */
     opt = &cli->opt[optno];
     if (opt->val_type <= 0)
-	return Clp_Error;
+	return (clp->opt = Clp_Error);
     vtpos = val_type_binsearch(cli, opt->val_type);
     if (vtpos == cli->nvaltype || cli->valtype[vtpos].val_type != opt->val_type)
-	return Clp_Error;
+	return (clp->opt = Clp_Error);
 
     /* complain == 1 only if the argument was explicitly given,
        or it is mandatory. */
@@ -1912,14 +1918,16 @@ Clp_Next(Clp_Parser *clp)
 		Clp_OptionError(clp, "%<%O%> requires a non-option argument");
 	    else
 		Clp_OptionError(clp, "%<%O%> requires an argument");
-	    return Clp_BadOption;
+	    return (clp->opt = Clp_BadOption);
 	}
 
     } else if (cli->is_short && !clp->have_val
-	       && cli->xtext[clp_utf8_charlen(cli, cli->xtext)])
+	       && cli->xtext[clp_utf8_charlen(cli, cli->xtext)]) {
 	/* The -[option]argument case:
 	   Assume that the rest of the current string is the argument. */
 	next_argument(clp, 1);
+	complain = 1;
+    }
 
     /* Parse the argument */
     if (clp->have_val) {
@@ -1927,14 +1935,14 @@ Clp_Next(Clp_Parser *clp)
 	if (atr->func(clp, clp->vstr, complain, atr->user_data) <= 0) {
 	    /* parser failed */
 	    clp->have_val = 0;
-	    if (cli->iopt[optno].imandatory)
-		return Clp_BadOption;
+	    if (complain)
+		return (clp->opt = Clp_BadOption);
 	    else
 		Clp_RestoreParser(clp, &clpsave);
 	}
     }
 
-    return opt->option_id;
+    return (clp->opt = opt->option_id);
 }
 
 
diff --git a/Build/source/utils/t1utils/t1utils-1.37/config.h.in b/Build/source/utils/t1utils/t1utils-1.38/config.h.in
index 76389dfbfe6..76389dfbfe6 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/config.h.in
+++ b/Build/source/utils/t1utils/t1utils-1.38/config.h.in
diff --git a/Build/source/utils/t1utils/t1utils-1.37/configure.ac b/Build/source/utils/t1utils/t1utils-1.38/configure.ac
index 4244bb2c9ad..3b3582b598e 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/configure.ac
+++ b/Build/source/utils/t1utils/t1utils-1.38/configure.ac
@@ -1,24 +1,25 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(t1ascii.c)
-AM_INIT_AUTOMAKE(t1utils, 1.37)
-AM_CONFIG_HEADER(config.h)
+AC_INIT([t1utils], [1.38])
+AC_CONFIG_SRCDIR([t1ascii.c])
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
 AC_C_CONST
 
-AC_ARG_ENABLE(warnings,
-[  --enable-warnings       compile with -Wall],
-if test "$enableval" = yes ; then
-  CFLAGS="$CFLAGS -W -Wall"
-fi)
+AC_ARG_ENABLE([warnings],
+  [AS_HELP_STRING([--enable-warnings], [compile with -W -Wall])],
+  [if test "$enableval" = yes; then
+    CFLAGS="$CFLAGS -W -Wall"
+  fi])
 
 
 dnl
 dnl strerror()?
 dnl
 
-AC_REPLACE_FUNCS(strerror)
+AC_REPLACE_FUNCS([strerror])
 
 
 dnl
diff --git a/Build/source/utils/t1utils/t1utils-1.37/include/lcdf/clp.h b/Build/source/utils/t1utils/t1utils-1.38/include/lcdf/clp.h
index 233182d76dc..1b658a17190 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/include/lcdf/clp.h
+++ b/Build/source/utils/t1utils/t1utils-1.38/include/lcdf/clp.h
@@ -8,7 +8,7 @@ extern "C" {
 /* clp.h - Public interface to CLP.
  * This file is part of CLP, the command line parser package.
  *
- * Copyright (c) 1997-2011 Eddie Kohler, ekohler@gmail.com
+ * Copyright (c) 1997-2012 Eddie Kohler, ekohler@gmail.com
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -165,6 +165,8 @@ typedef void (*Clp_ErrorHandler)(Clp_Parser *clp, const char *message);
  * value types, and current arguments.
  * @sa Clp_NewParser, Clp_SetOptions, Clp_SetArguments */
 struct Clp_Parser {
+    int opt;			/**< The last option. */
+
     int negated;		/**< Whether the last option was negated. */
 
     int have_val;		/**< Whether the last option had a value. */
diff --git a/Build/source/utils/t1utils/t1utils-1.37/include/lcdf/inttypes.h b/Build/source/utils/t1utils/t1utils-1.38/include/lcdf/inttypes.h
index b88e9e9faf0..b88e9e9faf0 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/include/lcdf/inttypes.h
+++ b/Build/source/utils/t1utils/t1utils-1.38/include/lcdf/inttypes.h
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1ascii.1 b/Build/source/utils/t1utils/t1utils-1.38/t1ascii.1
index 0ee3b6e5db8..0ee3b6e5db8 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1ascii.1
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1ascii.1
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1ascii.c b/Build/source/utils/t1utils/t1utils-1.38/t1ascii.c
index b8479212bf2..046f3047af7 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1ascii.c
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1ascii.c
@@ -4,15 +4,18 @@
  * converts it to ASCII (PFA) format.
  *
  * Copyright (c) 1992 by I. Lee Hetherington, all rights reserved.
+ * Copyright (c) 1998-2013 Eddie Kohler
  *
- * Permission is hereby granted to use, modify, and distribute this program
- * for any purpose provided this copyright notice and the one below remain
- * intact.
- *
- * I. Lee Hetherington (ilh@lcs.mit.edu)
- *
- * 1.5 and later versions contain changes by, and are maintained by,
- * Eddie Kohler <ekohler@gmail.com>.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, subject to the
+ * conditions listed in the Click LICENSE file, which is available in full at
+ * http://github.com/kohler/click/blob/master/LICENSE. The conditions
+ * include: you must preserve this copyright notice, and you cannot mention
+ * the copyright holders in advertising related to the Software without
+ * their permission. The Software is provided WITHOUT ANY WARRANTY, EXPRESS
+ * OR IMPLIED. This notice is a summary of the Click LICENSE file; the
+ * license in that file is binding.
  *
  * New change log in `NEWS'. Old change log:
  *
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1asm.1 b/Build/source/utils/t1utils/t1utils-1.38/t1asm.1
index 12e79a3729c..12e79a3729c 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1asm.1
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1asm.1
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1asm.c b/Build/source/utils/t1utils/t1utils-1.38/t1asm.c
index d59a5bcd633..b29ecb486f5 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1asm.c
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1asm.c
@@ -8,15 +8,18 @@
  * file.
  *
  * Copyright (c) 1992 by I. Lee Hetherington, all rights reserved.
+ * Copyright (c) 1998-2013 Eddie Kohler
  *
- * Permission is hereby granted to use, modify, and distribute this program
- * for any purpose provided this copyright notice and the one below remain
- * intact.
- *
- * I. Lee Hetherington (ilh@lcs.mit.edu)
- *
- * 1.5 and later versions contain changes by, and are maintained by,
- * Eddie Kohler <ekohler@gmail.com>.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, subject to the
+ * conditions listed in the Click LICENSE file, which is available in full at
+ * http://github.com/kohler/click/blob/master/LICENSE. The conditions
+ * include: you must preserve this copyright notice, and you cannot mention
+ * the copyright holders in advertising related to the Software without
+ * their permission. The Software is provided WITHOUT ANY WARRANTY, EXPRESS
+ * OR IMPLIED. This notice is a summary of the Click LICENSE file; the
+ * license in that file is binding.
  *
  * New change log in `NEWS'. Old change log:
  *
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1binary.1 b/Build/source/utils/t1utils/t1utils-1.38/t1binary.1
index 8f55e93c48d..8f55e93c48d 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1binary.1
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1binary.1
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1binary.c b/Build/source/utils/t1utils/t1utils-1.38/t1binary.c
index 8120fa51da4..e69b9ba8637 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1binary.c
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1binary.c
@@ -4,15 +4,18 @@
  * converts it to binary (PFB) format.
  *
  * Copyright (c) 1992 by I. Lee Hetherington, all rights reserved.
+ * Copyright (c) 1998-2013 Eddie Kohler
  *
- * Permission is hereby granted to use, modify, and distribute this program
- * for any purpose provided this copyright notice and the one below remain
- * intact.
- *
- * I. Lee Hetherington (ilh@lcs.mit.edu)
- *
- * 1.5 and later versions contain changes by, and are maintained by,
- * Eddie Kohler <ekohler@gmail.com>.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, subject to the
+ * conditions listed in the Click LICENSE file, which is available in full at
+ * http://github.com/kohler/click/blob/master/LICENSE. The conditions
+ * include: you must preserve this copyright notice, and you cannot mention
+ * the copyright holders in advertising related to the Software without
+ * their permission. The Software is provided WITHOUT ANY WARRANTY, EXPRESS
+ * OR IMPLIED. This notice is a summary of the Click LICENSE file; the
+ * license in that file is binding.
  *
  * New change log in `NEWS'. Old change log:
  *
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1disasm.1 b/Build/source/utils/t1utils/t1utils-1.38/t1disasm.1
index 4458fb46ea1..4458fb46ea1 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1disasm.1
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1disasm.1
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1disasm.c b/Build/source/utils/t1utils/t1utils-1.38/t1disasm.c
index bf48a15e5f1..dcec63f5f80 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1disasm.c
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1disasm.c
@@ -8,15 +8,18 @@
  * PFA format.
  *
  * Copyright (c) 1992 by I. Lee Hetherington, all rights reserved.
+ * Copyright (c) 1998-2013 Eddie Kohler
  *
- * Permission is hereby granted to use, modify, and distribute this program
- * for any purpose provided this copyright notice and the one below remain
- * intact.
- *
- * I. Lee Hetherington (ilh@lcs.mit.edu)
- *
- * 1.5 and later versions contain changes by, and are maintained by,
- * Eddie Kohler <ekohler@gmail.com>.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, subject to the
+ * conditions listed in the Click LICENSE file, which is available in full at
+ * http://github.com/kohler/click/blob/master/LICENSE. The conditions
+ * include: you must preserve this copyright notice, and you cannot mention
+ * the copyright holders in advertising related to the Software without
+ * their permission. The Software is provided WITHOUT ANY WARRANTY, EXPRESS
+ * OR IMPLIED. This notice is a summary of the Click LICENSE file; the
+ * license in that file is binding.
  *
  * New change log in `NEWS'. Old change log:
  *
@@ -64,6 +67,7 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <errno.h>
+#include <assert.h>
 #include <lcdf/clp.h>
 #include "t1lib.h"
 
@@ -314,6 +318,11 @@ static int save_cap = 0;
 static void
 append_save(const unsigned char *line, int len)
 {
+  if (line == save) {
+    assert(len <= save_cap);
+    save_len = len;
+    return;
+  }
   if (save_len + len >= save_cap) {
     unsigned char *new_save;
     if (!save_cap) save_cap = 1024;
@@ -363,6 +372,7 @@ eexec_line(unsigned char *line, int line_len)
 	append_save(line, line_len);
 	line = save;
 	line_len = save_len;
+        save_len = 0;
     }
 
     if (!line_len)
@@ -416,12 +426,10 @@ eexec_line(unsigned char *line, int line_len)
 	    decrypt_charstring(line + pos + 2 + cs_start_len, cs_len);
 	    pos += 2 + cs_start_len + cs_len;
 	    fprintf(ofp, "\t}%.*s", line_len - pos, line + pos);
-	    save_len = 0;
 	    return cut_newline;
 	} else {
 	    /* not long enough! */
-	    if (line != save)
-		append_save(line, line_len);
+            append_save(line, line_len);
 	    return 0;
 	}
     }
@@ -452,7 +460,6 @@ eexec_line(unsigned char *line, int line_len)
     set_lenIV((char *)line);
     set_cs_start((char *)line);
     fprintf(ofp, "%.*s", line_len, line);
-    save_len = 0;
 
     /* look for `currentfile closefile' to see if we should stop decrypting */
     if (oog_memstr(line, line_len, "currentfile closefile", 21) != 0)
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1lib.c b/Build/source/utils/t1utils/t1utils-1.38/t1lib.c
index 0dac40eddc0..6b49a196561 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1lib.c
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1lib.c
@@ -2,12 +2,18 @@
  *
  * This file contains functions for reading PFA and PFB files.
  *
- * (C) 1999-2008 Eddie Kohler <ekohler@gmail.com>, after code by
- * I. Lee Hetherington <ilh@lcs.mit.edu>. All rights reserved.
- *
- * Permission is hereby granted to use, modify, and distribute this program
- * for any purpose provided this copyright notice remains intact.
+ * Copyright (c) 1998-2013 Eddie Kohler
  *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, subject to the
+ * conditions listed in the Click LICENSE file, which is available in full at
+ * http://github.com/kohler/click/blob/master/LICENSE. The conditions
+ * include: you must preserve this copyright notice, and you cannot mention
+ * the copyright holders in advertising related to the Software without
+ * their permission. The Software is provided WITHOUT ANY WARRANTY, EXPRESS
+ * OR IMPLIED. This notice is a summary of the Click LICENSE file; the
+ * license in that file is binding.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1lib.h b/Build/source/utils/t1utils/t1utils-1.38/t1lib.h
index 93859fea731..93859fea731 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1lib.h
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1lib.h
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1mac.1 b/Build/source/utils/t1utils/t1utils-1.38/t1mac.1
index 4a759716e51..4a759716e51 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1mac.1
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1mac.1
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1mac.c b/Build/source/utils/t1utils/t1utils-1.38/t1mac.c
index a86c5e05c10..007e5802a2f 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1mac.c
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1mac.c
@@ -4,13 +4,19 @@
  * 1 fonts stored in MacBinary (I or II), AppleSingle, AppleDouble, BinHex, or
  * raw resource fork format.
  *
- * Copyright (c) 2000-2003 by Eddie Kohler, all rights reserved.
+ * Copyright (c) 2000-2013 Eddie Kohler
  *
- * Permission is hereby granted to use, modify, and distribute this program
- * for any purpose provided this copyright notice and the one below remain
- * intact. */
-
-/* Note: this is ANSI C. */
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, subject to the
+ * conditions listed in the Click LICENSE file, which is available in full at
+ * http://github.com/kohler/click/blob/master/LICENSE. The conditions
+ * include: you must preserve this copyright notice, and you cannot mention
+ * the copyright holders in advertising related to the Software without
+ * their permission. The Software is provided WITHOUT ANY WARRANTY, EXPRESS
+ * OR IMPLIED. This notice is a summary of the Click LICENSE file; the
+ * license in that file is binding.
+ */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1unmac.1 b/Build/source/utils/t1utils/t1utils-1.38/t1unmac.1
index 081ec31569f..081ec31569f 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1unmac.1
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1unmac.1
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1unmac.c b/Build/source/utils/t1utils/t1utils-1.38/t1unmac.c
index 02e431b10b4..5e2608bfddb 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1unmac.c
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1unmac.c
@@ -5,15 +5,18 @@
  * PFB formats.
  *
  * Copyright (c) 1992 by I. Lee Hetherington, all rights reserved.
+ * Copyright (c) 1998-2013 Eddie Kohler
  *
- * Permission is hereby granted to use, modify, and distribute this program
- * for any purpose provided this copyright notice and the one below remain
- * intact.
- *
- * I. Lee Hetherington (ilh@lcs.mit.edu)
- *
- * 1.5 and later versions contain changes by, and are maintained by,
- * Eddie Kohler <ekohler@gmail.com>.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, subject to the
+ * conditions listed in the Click LICENSE file, which is available in full at
+ * http://github.com/kohler/click/blob/master/LICENSE. The conditions
+ * include: you must preserve this copyright notice, and you cannot mention
+ * the copyright holders in advertising related to the Software without
+ * their permission. The Software is provided WITHOUT ANY WARRANTY, EXPRESS
+ * OR IMPLIED. This notice is a summary of the Click LICENSE file; the
+ * license in that file is binding.
  *
  * New change log in `NEWS'. Old change log:
  *
diff --git a/Build/source/utils/t1utils/t1utils-1.37/t1utils.spec b/Build/source/utils/t1utils/t1utils-1.38/t1utils.spec
index 579e8c8e7e6..579e8c8e7e6 100644
--- a/Build/source/utils/t1utils/t1utils-1.37/t1utils.spec
+++ b/Build/source/utils/t1utils/t1utils-1.38/t1utils.spec
diff --git a/Build/source/utils/t1utils/version.ac b/Build/source/utils/t1utils/version.ac
index c52f29a735b..623d371c2f3 100644
--- a/Build/source/utils/t1utils/version.ac
+++ b/Build/source/utils/t1utils/version.ac
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current t1utils version
-m4_define([t1utils_version], [1.37])
+m4_define([t1utils_version], [1.38])