t1utils 1.36

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

32 files changed, 175 insertions, 482 deletions

diff --git a/Build/source/utils/README b/Build/source/utils/README
index 1d3c0a38314..2b697e5410c 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -22,7 +22,7 @@ psutils p17 - checked 25nov06
   (Fabrice made small modifications for Windows, it seems)
   http://www.ctan.org/support/psutils/
 
-t1utils 1.35 - checked 10may10
+t1utils 1.36 - checked 7jun10
   http://www.lcdf.org/type/
 
 tpic2pdftex 1.97 - checked 9may10
diff --git a/Build/source/utils/t1utils/configure b/Build/source/utils/t1utils/configure
index 7336860e310..9cfdee39c04 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.65 for t1utils for TeX Live 1.35.
+# Generated by GNU Autoconf 2.65 for t1utils for TeX Live 1.36.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -552,12 +552,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='t1utils for TeX Live'
 PACKAGE_TARNAME='t1utils-for-tex-live'
-PACKAGE_VERSION='1.35'
-PACKAGE_STRING='t1utils for TeX Live 1.35'
+PACKAGE_VERSION='1.36'
+PACKAGE_STRING='t1utils for TeX Live 1.36'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="t1utils-1.35/t1ascii.c"
+ac_unique_file="t1utils-1.36/t1ascii.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1240,7 +1240,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 for TeX Live 1.35 to adapt to many kinds of systems.
+\`configure' configures t1utils for TeX Live 1.36 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1307,7 +1307,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of t1utils for TeX Live 1.35:";;
+     short | recursive ) echo "Configuration of t1utils for TeX Live 1.36:";;
    esac
   cat <<\_ACEOF
 
@@ -1399,7 +1399,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-t1utils for TeX Live configure 1.35
+t1utils for TeX Live configure 1.36
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2002,7 +2002,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 for TeX Live $as_me 1.35, which was
+It was created by t1utils for TeX Live $as_me 1.36, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2814,7 +2814,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='t1utils-for-tex-live'
- VERSION='1.35'
+ VERSION='1.36'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4656,7 +4656,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-T1UTILS_TREE=t1utils-1.35
+T1UTILS_TREE=t1utils-1.36
 
 
 
@@ -5187,7 +5187,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 for TeX Live $as_me 1.35, which was
+This file was extended by t1utils for TeX Live $as_me 1.36, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5253,7 +5253,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 for TeX Live config.status 1.35
+t1utils for TeX Live config.status 1.36
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/utils/t1utils/configure.ac b/Build/source/utils/t1utils/configure.ac
index ff5a5a54e32..1c63068adba 100644
--- a/Build/source/utils/t1utils/configure.ac
+++ b/Build/source/utils/t1utils/configure.ac
@@ -12,7 +12,7 @@ dnl  Adapted for TeX Live from t1utils-1.34/configure.in
 dnl
 dnl *********************************************************************
 dnl
-m4_define([t1utils_version], [1.35])[]dnl using unmodified t1utils source tree
+m4_define([t1utils_version], [1.36])[]dnl using unmodified t1utils source tree
 AC_INIT([t1utils for TeX Live], t1utils_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([t1utils-]t1utils_version[/t1ascii.c])
diff --git a/Build/source/utils/t1utils/t1utils-1.35-PATCHES/patch-02-static b/Build/source/utils/t1utils/t1utils-1.35-PATCHES/patch-02-static
deleted file mode 100644
index db97652ff50..00000000000
--- a/Build/source/utils/t1utils/t1utils-1.35-PATCHES/patch-02-static
+++ /dev/null
@@ -1,185 +0,0 @@
-	Declare all functions used in only one file as static.
-
-diff -ur t1utils-1.35.orig/clp.c t1utils-1.35/clp.c
---- t1utils-1.35.orig/clp.c	2008-12-07 02:17:20.000000000 +0100
-+++ t1utils-1.35/clp.c	2010-05-10 10:06:31.835158049 +0200
-@@ -612,7 +612,7 @@
-     return old_utf8;
- }
- 
--int
-+static int
- Clp_OptionChar(Clp_Parser *clp, int c)
- {
-     Clp_Internal *cli = clp->internal;
-@@ -1184,7 +1184,7 @@
- }
- 
- 
--int
-+static int
- finish_string_list(Clp_Parser *clp, int val_type, int flags,
- 		   Clp_Option *items, int nitems, int itemscap)
- {
-diff -ur t1utils-1.35.orig/t1ascii.c t1utils-1.35/t1ascii.c
---- t1utils-1.35.orig/t1ascii.c	2008-12-07 02:17:20.000000000 +0100
-+++ t1utils-1.35/t1ascii.c	2010-05-10 09:55:47.000000000 +0200
-@@ -100,7 +100,7 @@
-   putc('\n', stderr);
- }
- 
--void
-+static void
- short_usage(void)
- {
-   fprintf(stderr, "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\
-@@ -108,7 +108,7 @@
- 	  program_name, program_name);
- }
- 
--void
-+static void
- usage(void)
- {
-   printf("\
-diff -ur t1utils-1.35.orig/t1asm.c t1utils-1.35/t1asm.c
---- t1utils-1.35.orig/t1asm.c	2009-10-18 19:08:25.000000000 +0200
-+++ t1utils-1.35/t1asm.c	2010-05-10 09:55:47.000000000 +0200
-@@ -572,7 +572,7 @@
-   putc('\n', stderr);
- }
- 
--void
-+static void
- short_usage(void)
- {
-   fprintf(stderr, "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\
-@@ -580,7 +580,7 @@
- 	  program_name, program_name);
- }
- 
--void
-+static void
- usage(void)
- {
-   printf("\
-diff -ur t1utils-1.35.orig/t1binary.c t1utils-1.35/t1binary.c
---- t1utils-1.35.orig/t1binary.c	2008-12-07 02:17:20.000000000 +0100
-+++ t1utils-1.35/t1binary.c	2010-05-10 09:55:47.000000000 +0200
-@@ -132,7 +132,7 @@
- }
- 
- 
--void
-+static void
- short_usage(void)
- {
-   fprintf(stderr, "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\
-@@ -141,7 +141,7 @@
- }
- 
- 
--void
-+static void
- usage(void)
- {
-   printf("\
-diff -ur t1utils-1.35.orig/t1disasm.c t1utils-1.35/t1disasm.c
---- t1utils-1.35.orig/t1disasm.c	2008-12-07 02:17:20.000000000 +0100
-+++ t1utils-1.35/t1disasm.c	2010-05-10 09:55:47.000000000 +0200
-@@ -640,7 +640,7 @@
-   error_count++;
- }
- 
--void
-+static void
- short_usage(void)
- {
-   fprintf(stderr, "Usage: %s [INPUT [OUTPUT]]\n\
-@@ -648,7 +648,7 @@
- 	  program_name, program_name);
- }
- 
--void
-+static void
- usage(void)
- {
-   printf("\
-diff -ur t1utils-1.35.orig/t1mac.c t1utils-1.35/t1mac.c
---- t1utils-1.35.orig/t1mac.c	2008-12-07 02:17:20.000000000 +0100
-+++ t1utils-1.35/t1mac.c	2010-05-10 09:55:47.000000000 +0200
-@@ -778,7 +778,7 @@
- }
- 
- 
--void
-+static void
- short_usage(void)
- {
-   fprintf(stderr, "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\
-@@ -787,7 +787,7 @@
- }
- 
- 
--void
-+static void
- usage(void)
- {
-   printf("\
-diff -ur t1utils-1.35.orig/t1unmac.c t1utils-1.35/t1unmac.c
---- t1utils-1.35.orig/t1unmac.c	2008-12-07 02:17:20.000000000 +0100
-+++ t1utils-1.35/t1unmac.c	2010-05-10 09:55:47.000000000 +0200
-@@ -259,7 +259,7 @@
-   putc('\n', stderr);
- }
- 
--void
-+static void
- short_usage(void)
- {
-   fprintf(stderr, "Usage: %s [OPTION]... INPUT [OUTPUT]\n\
-@@ -267,7 +267,7 @@
- 	  program_name, program_name);
- }
- 
--void
-+static void
- usage(void)
- {
-   printf("\
-@@ -388,7 +388,7 @@
- #define APPLESINGLE_MAGIC 0x00051600
- #define APPLEDOUBLE_MAGIC 0x00051607
- 
--const char *
-+static const char *
- check_appledouble(FILE *ifp)
- {
-   int i;
-@@ -400,7 +400,7 @@
-   return 0;
- }
- 
--const char *
-+static const char *
- translate_binhex(FILE *f, FILE *tmpf)
- {
-   int i, c = 0, last_char, after_x90, bits, bitpos;
-@@ -486,7 +486,7 @@
-   return 0;
- }
- 
--int
-+static int
- check_binhex_crc(FILE *f, int offset, int length)
- {
-   int crc = 0;
-@@ -501,7 +501,7 @@
-   return crc == 0;
- }
- 
--const char *
-+static const char *
- check_binhex(FILE *f)
- {
-   int fname_len, data_len, rsrc_len, off;
diff --git a/Build/source/utils/t1utils/t1utils-1.35-PATCHES/patch-03-warnings b/Build/source/utils/t1utils/t1utils-1.35-PATCHES/patch-03-warnings
deleted file mode 100644
index ab6c2964cae..00000000000
--- a/Build/source/utils/t1utils/t1utils-1.35-PATCHES/patch-03-warnings
+++ /dev/null
@@ -1,226 +0,0 @@
-	Avoid compiler warnings:
-	ANSI C function definitions.
-	Declare various (param and other) strings as const.
-
-diff -ur t1utils-1.35.orig/clp.c t1utils-1.35/clp.c
---- t1utils-1.35.orig/clp.c	2010-05-10 10:06:31.000000000 +0200
-+++ t1utils-1.35/clp.c	2010-05-10 10:36:50.091602641 +0200
-@@ -275,7 +275,7 @@
- }
- 
- static int
--decode_utf8(const char *s, char **cp)
-+decode_utf8(const char *s, const char **cp)
- {
-     int c;
-     if ((unsigned char) *s <= 0x7F)		/* 1 byte:  0x000000-0x00007F */
-@@ -319,14 +319,14 @@
- 	    /* nothing */;
-     }
-     if (cp)
--	*cp = (char *) s;
-+	*cp = s;
-     return c;
- }
- 
- static int
- utf8_charlen(const char *s)
- {
--    char *sout;
-+    const char *sout;
-     (void) decode_utf8(s, &sout);
-     return sout - s;
- }
-@@ -364,7 +364,7 @@
-     if ((cli->long1pos || cli->long1neg) && io->ilong) {
- 	const char *name = o->long_name + io->ilongoff;
- 	if (cli->utf8) {
--	    int c = decode_utf8(name, (char **) &name);
-+	    int c = decode_utf8(name, &name);
- 	    if (!*name && c && c != U_REPLACEMENT)
- 		return c;
- 	} else if (name[0] && !name[1])
-@@ -1068,22 +1068,28 @@
- static int
- parse_int(Clp_Parser *clp, const char *arg, int complain, void *user_data)
- {
--    char *val;
-+    const char *val;
-+    char *temp;
-     if (*arg == 0 || isspace((unsigned char) *arg)
- 	|| (user_data != 0 && *arg == '-'))
--	val = (char *) arg;
-+	val = arg;
-     else if (user_data != 0) {	/* unsigned */
- #if HAVE_STRTOUL
--	clp->val.u = strtoul(arg, &val, 0);
-+	clp->val.u = strtoul(arg, &temp, 0);
-+	val = temp;
- #else
- 	/* don't bother really trying to do it right */
- 	if (arg[0] == '-')
--	    val = (char *) arg;
--	else
--	    clp->val.u = strtol(arg, &val, 0);
-+	    val = arg;
-+	else {
-+	    clp->val.u = strtol(arg, &temp, 0);
-+	    val = temp;
-+	}
- #endif
--    } else
--	clp->val.i = strtol(arg, &val, 0);
-+    } else {
-+	clp->val.i = strtol(arg, &temp, 0);
-+	val = temp;
-+    }
-     if (*arg != 0 && *val == 0)
- 	return 1;
-     else if (complain) {
-@@ -1098,12 +1104,15 @@
- static int
- parse_double(Clp_Parser *clp, const char *arg, int complain, void *user_data)
- {
--    char *val;
-+    const char *val;
-+    char *temp;
-     (void)user_data;
-     if (*arg == 0 || isspace((unsigned char) *arg))
--	val = (char *) arg;
--    else
--	clp->val.d = strtod(arg, &val);
-+	val = arg;
-+    else {
-+	clp->val.d = strtod(arg, &temp);
-+	val = temp;
-+    }
-     if (*arg != 0 && *val == 0)
- 	return 1;
-     else if (complain)
-@@ -1516,7 +1525,7 @@
- {
-     int c;
-     if (clp->internal->utf8) {
--	char *s;
-+	const char *s;
- 	c = decode_utf8(text, &s);
- 	*ocharskip = s - text;
-     } else {
-diff -ur t1utils-1.35.orig/t1ascii.c t1utils-1.35/t1ascii.c
---- t1utils-1.35.orig/t1ascii.c	2010-05-10 09:55:47.000000000 +0200
-+++ t1utils-1.35/t1ascii.c	2010-05-10 10:08:33.942078828 +0200
-@@ -172,7 +172,7 @@
- }
- 
- static void
--pfa_output_end()
-+pfa_output_end(void)
- {
- }
- 
-diff -ur t1utils-1.35.orig/t1asm.c t1utils-1.35/t1asm.c
---- t1utils-1.35.orig/t1asm.c	2010-05-10 09:55:47.000000000 +0200
-+++ t1utils-1.35/t1asm.c	2010-05-10 10:08:33.942078828 +0200
-@@ -266,7 +266,7 @@
-    charstring. We use the heuristic that it should start with `/' (a name) or
-    `dup' (a subroutine). Previous heuristic caused killa bad output. */
- 
--static int check_line_charstring()
-+static int check_line_charstring(void)
- {
-   char *p = line;
-   while (isspace(*p))
-@@ -280,7 +280,7 @@
-    the newline is put into line[]. When terminated by '{', the '{' is not put
-    into line[], and the flag start_charstring is set to 1. */
- 
--static void t1utils_getline()
-+static void t1utils_getline(void)
- {
-   int c;
-   char *p = line;
-@@ -367,7 +367,7 @@
- /* This function initializes charstring encryption.  Note that this is called
-    at the beginning of every charstring. */
- 
--static void charstring_start()
-+static void charstring_start(void)
- {
-   int i;
- 
-@@ -390,7 +390,7 @@
- /* This function outputs buffered, encrypted charstring data through possible
-    eexec encryption. */
- 
--static void charstring_end()
-+static void charstring_end(void)
- {
-   byte *bp;
- 
-@@ -433,7 +433,7 @@
- 
- /* This function returns one charstring token. It ignores comments. */
- 
--static void get_charstring_token()
-+static void get_charstring_token(void)
- {
-   int c = getc(ifp);
-   while (isspace(c))
-@@ -466,7 +466,7 @@
- /* This function parses an entire charstring into integers and commands,
-    outputting bytes through the charstring buffer. */
- 
--static void parse_charstring()
-+static void parse_charstring(void)
- {
-   struct command *cp;
- 
-diff -ur t1utils-1.35.orig/t1binary.c t1utils-1.35/t1binary.c
---- t1utils-1.35.orig/t1binary.c	2010-05-10 09:55:47.000000000 +0200
-+++ t1utils-1.35/t1binary.c	2010-05-10 10:08:33.942078828 +0200
-@@ -85,7 +85,7 @@
- }
- 
- static void
--pfb_output_end()
-+pfb_output_end(void)
- {
-   pfb_writer_end(&w);
- }
-diff -ur t1utils-1.35.orig/t1disasm.c t1utils-1.35/t1disasm.c
---- t1utils-1.35.orig/t1disasm.c	2010-05-10 09:55:47.000000000 +0200
-+++ t1utils-1.35/t1disasm.c	2010-05-10 10:08:33.942078828 +0200
-@@ -332,11 +332,11 @@
- /* 23.Feb.2004 - use 'memstr', not strstr, because the strings input to
-    eexec_line aren't null terminated! Reported by Werner Lemberg. */
- 
--static const unsigned char *
--oog_memstr(const unsigned char *line, int line_len, const char *pattern, int pattern_len)
-+static unsigned char *
-+oog_memstr(unsigned char *line, int line_len, const char *pattern, int pattern_len)
- {
--    const unsigned char *try;
--    const unsigned char *last = line + line_len - pattern_len + 1;
-+    unsigned char *try;
-+    unsigned char *last = line + line_len - pattern_len + 1;
-     while (line < last
- 	   && (try = memchr(line, (unsigned char)*pattern, last - line))) {
- 	if (memcmp(try, pattern, pattern_len) == 0)
-@@ -432,7 +432,7 @@
-        badly: a charstring definition follows "/Charstrings ... begin", ON THE
-        SAME LINE. */
-     {
--	const char *CharStrings = (const char *)
-+	char *CharStrings = (char *)
- 	    oog_memstr(line, line_len, "/CharStrings ", 13);
- 	int crap, n;
- 	char should_be_slash = 0;
-@@ -595,7 +595,7 @@
- }
- 
- static void
--disasm_output_end()
-+disasm_output_end(void)
- {
-     /* take care of leftover saved data */
-     static char crap[1] = "";
diff --git a/Build/source/utils/t1utils/t1utils-1.35-PATCHES/ChangeLog b/Build/source/utils/t1utils/t1utils-1.36-PATCHES/ChangeLog
index 682e8c32f38..b4b84291fa3 100644
--- a/Build/source/utils/t1utils/t1utils-1.35-PATCHES/ChangeLog
+++ b/Build/source/utils/t1utils/t1utils-1.36-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapt to t1utils-1.35.
+	* patch-02-static (removed): Now handled in original sources.
+	* patch-03-warnings: Adapted, now mostly in original sources.
+
 2010-05-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to t1utils-1.35.
diff --git a/Build/source/utils/t1utils/t1utils-1.35-PATCHES/TL-Changes b/Build/source/utils/t1utils/t1utils-1.36-PATCHES/TL-Changes
index 8316545e927..9ae1d0e2b73 100644
--- a/Build/source/utils/t1utils/t1utils-1.35-PATCHES/TL-Changes
+++ b/Build/source/utils/t1utils/t1utils-1.36-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the t1utils-1.35 tree as obtained from:
+Changes applied to the t1utils-1.36 tree as obtained from:
 	http://www.lcdf.org/type/
 
 Removed:
diff --git a/Build/source/utils/t1utils/t1utils-1.36-PATCHES/patch-03-warnings b/Build/source/utils/t1utils/t1utils-1.36-PATCHES/patch-03-warnings
new file mode 100644
index 00000000000..e95d901c213
--- /dev/null
+++ b/Build/source/utils/t1utils/t1utils-1.36-PATCHES/patch-03-warnings
@@ -0,0 +1,83 @@
+	Avoid compiler warnings (gcc's -Wcast-qual).
+
+diff -ur t1utils-1.36.orig/clp.c t1utils-1.36/clp.c
+--- t1utils-1.36.orig/clp.c	2010-05-30 02:10:51.000000000 +0200
++++ t1utils-1.36/clp.c	2010-06-07 15:19:30.622447605 +0200
+@@ -1074,21 +1074,27 @@
+ parse_int(Clp_Parser *clp, const char *arg, int complain, void *user_data)
+ {
+     const char *val;
++    char *temp;
+     if (*arg == 0 || isspace((unsigned char) *arg)
+ 	|| (user_data != 0 && *arg == '-'))
+ 	val = arg;
+     else if (user_data != 0) {	/* unsigned */
+ #if HAVE_STRTOUL
+-	clp->val.u = strtoul(arg, (char **) &val, 0);
++	clp->val.u = strtoul(arg, &temp, 0);
++	val = temp;
+ #else
+ 	/* don't bother really trying to do it right */
+ 	if (arg[0] == '-')
+ 	    val = arg;
+-	else
+-	    clp->val.u = strtol(arg, (char **) &val, 0);
++	else {
++	    clp->val.u = strtol(arg, &temp, 0);
++	    val = temp;
++	}
+ #endif
+-    } else
+-	clp->val.i = strtol(arg, (char **) &val, 0);
++    } else {
++	clp->val.i = strtol(arg, &temp, 0);
++	val = temp;
++    }
+     if (*arg != 0 && *val == 0)
+ 	return 1;
+     else if (complain) {
+@@ -1104,11 +1110,14 @@
+ parse_double(Clp_Parser *clp, const char *arg, int complain, void *user_data)
+ {
+     const char *val;
++    char *temp;
+     (void)user_data;
+     if (*arg == 0 || isspace((unsigned char) *arg))
+ 	val = arg;
+-    else
+-	clp->val.d = strtod(arg, (char **) &val);
++    else {
++	clp->val.d = strtod(arg, &temp);
++	val = temp;
++    }
+     if (*arg != 0 && *val == 0)
+ 	return 1;
+     else if (complain)
+diff -ur t1utils-1.36.orig/t1disasm.c t1utils-1.36/t1disasm.c
+--- t1utils-1.36.orig/t1disasm.c	2010-05-30 02:26:17.000000000 +0200
++++ t1utils-1.36/t1disasm.c	2010-06-07 13:44:35.000000000 +0200
+@@ -332,11 +332,11 @@
+ /* 23.Feb.2004 - use 'memstr', not strstr, because the strings input to
+    eexec_line aren't null terminated! Reported by Werner Lemberg. */
+ 
+-static const unsigned char *
+-oog_memstr(const unsigned char *line, int line_len, const char *pattern, int pattern_len)
++static unsigned char *
++oog_memstr(unsigned char *line, int line_len, const char *pattern, int pattern_len)
+ {
+-    const unsigned char *try;
+-    const unsigned char *last = line + line_len - pattern_len + 1;
++    unsigned char *try;
++    unsigned char *last = line + line_len - pattern_len + 1;
+     while (line < last
+ 	   && (try = memchr(line, (unsigned char)*pattern, last - line))) {
+ 	if (memcmp(try, pattern, pattern_len) == 0)
+@@ -432,7 +432,7 @@
+        badly: a charstring definition follows "/Charstrings ... begin", ON THE
+        SAME LINE. */
+     {
+-	const char *CharStrings = (const char *)
++	char *CharStrings = (char *)
+ 	    oog_memstr(line, line_len, "/CharStrings ", 13);
+ 	int crap, n;
+ 	char should_be_slash = 0;
diff --git a/Build/source/utils/t1utils/t1utils-1.35/INSTALL b/Build/source/utils/t1utils/t1utils-1.36/INSTALL
index 95d84c820fb..95d84c820fb 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/INSTALL
+++ b/Build/source/utils/t1utils/t1utils-1.36/INSTALL
diff --git a/Build/source/utils/t1utils/t1utils-1.35/Makefile.am b/Build/source/utils/t1utils/t1utils-1.36/Makefile.am
index a440fc1b522..b294bea08ed 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/Makefile.am
+++ b/Build/source/utils/t1utils/t1utils-1.36/Makefile.am
@@ -22,13 +22,6 @@ LDADD = @LIBOBJS@
 
 EXTRA_DIST = $(man_MANS) t1utils.spec
 
-srclinks:
-	cd $(top_srcdir); test -d include/lcdf || mkdir -p include/lcdf
-	cd $(top_srcdir); for i in clp.h inttypes.h; do \
-	ln -sf ../../../liblcdf/include/lcdf/$$i include/lcdf/$$i; done
-	cd $(top_srcdir); for i in clp.c strerror.c; do \
-	ln -sf ../liblcdf/liblcdf/$$i $$i; done
-
 versionize:
 	perl -pi -e "s/^\\.ds V.*/.ds V $(VERSION)/;" t1ascii.1 t1binary.1 t1disasm.1 t1asm.1 t1unmac.1 t1mac.1
 	perl -pi -e 's/^Version:(\s*).*/Version:$${1}$(VERSION)/; s/$(PACKAGE)-[\w.]+\.tar\.gz/$(PACKAGE)-$(VERSION).tar.gz/;' t1utils.spec
diff --git a/Build/source/utils/t1utils/t1utils-1.35/NEWS b/Build/source/utils/t1utils/t1utils-1.36/NEWS
index 2e352d91c3c..9a3b30c7d06 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/NEWS
+++ b/Build/source/utils/t1utils/t1utils-1.36/NEWS
@@ -1,5 +1,10 @@
 T1utils NEWS
 
+Version 1.36   29.May.2010
+
+* Several minor cleanups.
+
+
 Version 1.35   22.Oct.2009
 
 * Don't use "getline" as a symbol (reported by Karl Berry and
diff --git a/Build/source/utils/t1utils/t1utils-1.35/README b/Build/source/utils/t1utils/t1utils-1.36/README
index 697cf10056d..0f7415491be 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/README
+++ b/Build/source/utils/t1utils/t1utils-1.36/README
@@ -1,4 +1,4 @@
-T1UTILS VERSION 1.35 NOTES
+T1UTILS VERSION 1.36 NOTES
 ==========================
 
    You need an ANSI C compiler, such as gcc.
diff --git a/Build/source/utils/t1utils/t1utils-1.35/clp.c b/Build/source/utils/t1utils/t1utils-1.36/clp.c
index ea1fd38dc84..ae17c9acd9c 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/clp.c
+++ b/Build/source/utils/t1utils/t1utils-1.36/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-2008 Eddie Kohler, ekohler@gmail.com
+ * Copyright (c) 1997-2010 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"),
@@ -393,11 +393,11 @@ compare_options(Clp_Parser *clp, const Clp_Option *o1, Clp_InternOption *io1,
 	int short2 = (io2->ishort ? o2->short_name : -3);
 	int shortx2 = long_as_short(cli, o2, io2, -4);
 	if (short1 == short2)
-	    Clp_OptionError(clp, "CLP internal error: more than 1 option has short name %`%c%'", short1);
+	    Clp_OptionError(clp, "CLP internal error: more than 1 option has short name %<%c%>", short1);
 	else if ((short1 == shortx2 || shortx1 == short2 || shortx1 == shortx2)
 		 && ((io1->ipos && io2->ipos && cli->long1pos)
 		     || (io1->ineg && io2->ineg && cli->long1neg)))
-	    Clp_OptionError(clp, "CLP internal error: 1-char long name conflicts with short name %`%c%'", (short1 == shortx2 ? shortx2 : shortx1));
+	    Clp_OptionError(clp, "CLP internal error: 1-char long name conflicts with short name %<%c%>", (short1 == shortx2 ? shortx2 : shortx1));
     }
 
     /* analyze longest minimum match */
@@ -419,7 +419,7 @@ compare_options(Clp_Parser *clp, const Clp_Option *o1, Clp_InternOption *io1,
 	if (io2->ilong) {
 	    const char *name2 = o2->long_name + io2->ilongoff;
 	    if (strcmp(name1, name2) == 0)
-		Clp_OptionError(clp, "CLP internal error: duplicate long name %`%s%'", name1);
+		Clp_OptionError(clp, "CLP internal error: duplicate long name %<%s%>", name1);
 	    if (io1->ipos && io2->ipos && !strncmp(name1, name2, io1->lmmpos)
 		&& (!io1->iprefmatch || strncmp(name1, name2, strlen(name1))))
 		io1->lmmpos = min_different_chars(name1, name2);
@@ -448,14 +448,14 @@ compare_options(Clp_Parser *clp, const Clp_Option *o1, Clp_InternOption *io1,
  * first argument returned by Clp_Next() will be the second argument in @a
  * argv.  Note that this behavior differs from Clp_SetArguments.</li>
  * <li>UTF-8 support is on iff the <tt>LANG</tt> environment variable contains
- * one of the substrings "UTF-8", "UTF8", or "utf8".</li>
+ * one of the substrings "UTF-8", "UTF8", or "utf8".  Override this with
+ * Clp_SetUTF8().</li>
  * <li>The Clp_ValString, Clp_ValStringNotOption, Clp_ValInt, Clp_ValUnsigned,
  * Clp_ValBool, and Clp_ValDouble types are installed.</li>
  * <li>Errors are reported to standard error.</li>
  * </ul>
  *
- * To override these characteristics, either call functions like
- * Clp_SetUTF8(), or create your Clp_Parser with no arguments or options
+ * You may also create a Clp_Parser with no arguments or options
  * (<tt>Clp_NewParser(0, 0, 0, 0)</tt>) and set the arguments and options
  * later.
  *
@@ -471,7 +471,9 @@ Clp_NewParser(int argc, const char * const *argv, int nopt, const Clp_Option *op
     Clp_Parser *clp = (Clp_Parser *)malloc(sizeof(Clp_Parser));
     Clp_Internal *cli = (Clp_Internal *)malloc(sizeof(Clp_Internal));
     Clp_InternOption *iopt = (Clp_InternOption *)malloc(sizeof(Clp_InternOption) * nopt);
-    if (!clp || !cli || !iopt)
+    if (cli)
+	cli->valtype = (Clp_ValType *)malloc(sizeof(Clp_ValType) * Clp_InitialValType);
+    if (!clp || !cli || !iopt || !cli->valtype)
 	goto failed;
 
     clp->negated = 0;
@@ -508,11 +510,7 @@ Clp_NewParser(int argc, const char * const *argv, int nopt, const Clp_Option *op
     cli->long1pos = cli->long1neg = 0;
 
     /* Add default type parsers */
-    cli->valtype = (Clp_ValType *)malloc(sizeof(Clp_ValType) * Clp_InitialValType);
-    if (!cli->valtype)
-	goto failed;
     cli->nvaltype = 0;
-
     Clp_AddType(clp, Clp_ValString, 0, parse_string, 0);
     Clp_AddType(clp, Clp_ValStringNotOption, Clp_DisallowOptions, parse_string, 0);
     Clp_AddType(clp, Clp_ValInt, 0, parse_int, 0);
@@ -612,7 +610,14 @@ Clp_SetUTF8(Clp_Parser *clp, int utf8)
     return old_utf8;
 }
 
-static int
+/** @param clp the parser
+ * @param c character
+ * @return option character treatment
+ *
+ * Returns an integer specifying how CLP treats arguments that begin
+ * with character @a c.  See Clp_SetOptionChar for possibilities.
+ */
+int
 Clp_OptionChar(Clp_Parser *clp, int c)
 {
     Clp_Internal *cli = clp->internal;
@@ -1094,8 +1099,8 @@ parse_int(Clp_Parser *clp, const char *arg, int complain, void *user_data)
 	return 1;
     else if (complain) {
 	const char *message = user_data != 0
-	    ? "%`%O%' expects a nonnegative integer, not %`%s%'"
-	    : "%`%O%' expects an integer, not %`%s%'";
+	    ? "%<%O%> expects a nonnegative integer, not %<%s%>"
+	    : "%<%O%> expects an integer, not %<%s%>";
 	return Clp_OptionError(clp, message, arg);
     } else
 	return 0;
@@ -1116,7 +1121,7 @@ parse_double(Clp_Parser *clp, const char *arg, int complain, void *user_data)
     if (*arg != 0 && *val == 0)
 	return 1;
     else if (complain)
-	return Clp_OptionError(clp, "%`%O%' expects a real number, not %`%s%'", arg);
+	return Clp_OptionError(clp, "%<%O%> expects a real number, not %<%s%>", arg);
     else
 	return 0;
 }
@@ -1148,7 +1153,7 @@ parse_bool(Clp_Parser *clp, const char *arg, int complain, void *user_data)
 
   error:
     if (complain)
-	Clp_OptionError(clp, "%`%O%' expects a true-or-false value, not %`%s%'", arg);
+	Clp_OptionError(clp, "%<%O%> expects a true-or-false value, not %<%s%>", arg);
     return 0;
 }
 
@@ -1187,7 +1192,7 @@ parse_string_list(Clp_Parser *clp, const char *arg, int complain, void *user_dat
 	}
 	return ambiguity_error
 	    (clp, ambiguous, ambiguous_values, sl->items, sl->iopt,
-	     "", "option %`%O%' value %`%s%' is %s", arg, complaint);
+	     "", "option %<%O%> value %<%s%> is %s", arg, complaint);
     } else
 	return 0;
 }
@@ -1853,13 +1858,13 @@ Clp_Next(Clp_Parser *clp)
 	if (cli->ambiguous)
 	    ambiguity_error(clp, cli->ambiguous, cli->ambiguous_values,
 			    cli->opt, cli->iopt, cli->option_chars,
-			    "option %`%s%s%' is ambiguous",
+			    "option %<%s%s%> is ambiguous",
 			    cli->option_chars, cli->xtext);
 	else if (cli->is_short && !cli->could_be_short)
-	    Clp_OptionError(clp, "unrecognized option %`%s%C%'",
+	    Clp_OptionError(clp, "unrecognized option %<%s%C%>",
 			    cli->option_chars, cli->xtext);
 	else
-	    Clp_OptionError(clp, "unrecognized option %`%s%s%'",
+	    Clp_OptionError(clp, "unrecognized option %<%s%s%>",
 			    cli->option_chars, cli->xtext);
 
 	return Clp_BadOption;
@@ -1874,7 +1879,7 @@ Clp_Next(Clp_Parser *clp)
     if (clp->negated
 	|| (!cli->iopt[optno].imandatory && !cli->iopt[optno].ioptional)) {
 	if (clp->have_val) {
-	    Clp_OptionError(clp, "%`%O%' can't take an argument");
+	    Clp_OptionError(clp, "%<%O%> can%,t take an argument");
 	    return Clp_BadOption;
 	} else
 	    return cli->opt[optno].option_id;
@@ -1904,9 +1909,9 @@ Clp_Next(Clp_Parser *clp)
 	    int got_option = cli->xtext != 0;
 	    Clp_RestoreParser(clp, &clpsave);
 	    if (got_option)
-		Clp_OptionError(clp, "%`%O%' requires a non-option argument");
+		Clp_OptionError(clp, "%<%O%> requires a non-option argument");
 	    else
-		Clp_OptionError(clp, "%`%O%' requires an argument");
+		Clp_OptionError(clp, "%<%O%> requires an argument");
 	    return Clp_BadOption;
 	}
 
@@ -2125,11 +2130,14 @@ Clp_VaOptionError(Clp_Parser *clp, Clp_BuildString *bs,
 		*bs->pos++ = '%';
 	    break;
 
-	  case '`':
+	  case '`':		/* backwards compatibility */
+	  case '<':
 	    append_build_string(bs, (cli->utf8 ? "\342\200\230" : "'"), -1);
 	    break;
 
-	  case '\'':
+	  case '\'':		/* backwards compatibility */
+	  case ',':
+	  case '>':
 	    append_build_string(bs, (cli->utf8 ? "\342\200\231" : "'"), -1);
 	    break;
 
@@ -2194,12 +2202,15 @@ do_error(Clp_Parser *clp, Clp_BuildString *bs)
  * current option is defined in the Clp_Parser object itself.</dd>
  * <dt><tt>%%</tt></dt>
  * <dd>Prints a percent character.</dd>
- * <dt><tt>%</tt><tt>`</tt></dt>
- * <dd>In UTF-8 mode, prints a left single quote.  Otherwise prints a single
- * quote.</dd>
- * <dt><tt>%</tt><tt>'</tt></dt>
- * <dd>In UTF-8 mode, prints a right single quote.  Otherwise prints a single
- * quote.</dd>
+ * <dt><tt>%</tt><tt>&lt;</tt></dt>
+ * <dd>Prints an open quote string.  In UTF-8 mode, prints a left single
+ * quote.  Otherwise prints a single quote.</dd>
+ * <dt><tt>%</tt><tt>&gt;</tt></dt>
+ * <dd>Prints a closing quote string.  In UTF-8 mode, prints a right single
+ * quote.  Otherwise prints a single quote.</dd>
+ * <dt><tt>%</tt><tt>,</tt></dt>
+ * <dd>Prints an apostrophe.  In UTF-8 mode, prints a right single quote.
+ * Otherwise prints a single quote.</dd>
  * </dl>
  *
  * Note that no flag characters, precision, or field width characters are
diff --git a/Build/source/utils/t1utils/t1utils-1.35/config.h.in b/Build/source/utils/t1utils/t1utils-1.36/config.h.in
index d52eb2d2319..76389dfbfe6 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/config.h.in
+++ b/Build/source/utils/t1utils/t1utils-1.36/config.h.in
@@ -57,6 +57,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/Build/source/utils/t1utils/t1utils-1.35/configure.ac b/Build/source/utils/t1utils/t1utils-1.36/configure.ac
index 8df136fdcf5..8787d3850de 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/configure.ac
+++ b/Build/source/utils/t1utils/t1utils-1.36/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(t1ascii.c)
-AM_INIT_AUTOMAKE(t1utils, 1.35)
+AM_INIT_AUTOMAKE(t1utils, 1.36)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/Build/source/utils/t1utils/t1utils-1.35/include/lcdf/clp.h b/Build/source/utils/t1utils/t1utils-1.36/include/lcdf/clp.h
index bcec630fe49..15476d52d35 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/include/lcdf/clp.h
+++ b/Build/source/utils/t1utils/t1utils-1.36/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-2008 Eddie Kohler, ekohler@gmail.com
+ * Copyright (c) 1997-2010 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"),
@@ -224,6 +224,9 @@ Clp_ErrorHandler Clp_SetErrorHandler(Clp_Parser *clp, Clp_ErrorHandler errh);
 /** @brief Set @a clp's UTF-8 mode. */
 int Clp_SetUTF8(Clp_Parser *clp, int utf8);
 
+/** @brief Return @a clp's treatment of character @a c. */
+int Clp_OptionChar(Clp_Parser *clp, int c);
+
 /** @brief Set @a clp's treatment of character @a c. */
 int Clp_SetOptionChar(Clp_Parser *clp, int c, int type);
 
diff --git a/Build/source/utils/t1utils/t1utils-1.35/include/lcdf/inttypes.h b/Build/source/utils/t1utils/t1utils-1.36/include/lcdf/inttypes.h
index b88e9e9faf0..b88e9e9faf0 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/include/lcdf/inttypes.h
+++ b/Build/source/utils/t1utils/t1utils-1.36/include/lcdf/inttypes.h
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1ascii.1 b/Build/source/utils/t1utils/t1utils-1.36/t1ascii.1
index 5f23d0be5da..15e54fa2a77 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1ascii.1
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1ascii.1
@@ -1,4 +1,4 @@
-.ds V 1.35
+.ds V 1.36
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1ascii.c b/Build/source/utils/t1utils/t1utils-1.36/t1ascii.c
index 3e174816b4e..7e256d28e93 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1ascii.c
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1ascii.c
@@ -235,7 +235,7 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("t1ascii (LCDF t1utils) %s\n", VERSION);
-      printf("Copyright (C) 1992-2003 I. Lee Hetherington, Eddie Kohler et al.\n\
+      printf("Copyright (C) 1992-2010 I. Lee Hetherington, Eddie Kohler et al.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1asm.1 b/Build/source/utils/t1utils/t1utils-1.36/t1asm.1
index 6ed9ba2c11a..e25613b7cdf 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1asm.1
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1asm.1
@@ -1,4 +1,4 @@
-.ds V 1.35
+.ds V 1.36
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1asm.c b/Build/source/utils/t1utils/t1utils-1.36/t1asm.c
index 1b7850daa52..488a5b39f57 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1asm.c
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1asm.c
@@ -650,7 +650,7 @@ int main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("t1asm (LCDF t1utils) %s\n", VERSION);
-      printf("Copyright (C) 1992-2003 I. Lee Hetherington, Eddie Kohler et al.\n\
+      printf("Copyright (C) 1992-2010 I. Lee Hetherington, Eddie Kohler et al.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1binary.1 b/Build/source/utils/t1utils/t1utils-1.36/t1binary.1
index b33cbe2b6d4..e84afc7730d 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1binary.1
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1binary.1
@@ -1,4 +1,4 @@
-.ds V 1.35
+.ds V 1.36
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1binary.c b/Build/source/utils/t1utils/t1utils-1.36/t1binary.c
index 614bb811004..8120fa51da4 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1binary.c
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1binary.c
@@ -210,7 +210,7 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("t1binary (LCDF t1utils) %s\n", VERSION);
-      printf("Copyright (C) 1992-2003 I. Lee Hetherington, Eddie Kohler et al.\n\
+      printf("Copyright (C) 1992-2010 I. Lee Hetherington, Eddie Kohler et al.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1disasm.1 b/Build/source/utils/t1utils/t1utils-1.36/t1disasm.1
index 3115ee2d493..29ad9949413 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1disasm.1
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1disasm.1
@@ -1,4 +1,4 @@
-.ds V 1.35
+.ds V 1.36
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1disasm.c b/Build/source/utils/t1utils/t1utils-1.36/t1disasm.c
index b77db4d29b1..25318a96ee2 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1disasm.c
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1disasm.c
@@ -707,7 +707,7 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("t1disasm (LCDF t1utils) %s\n", VERSION);
-      printf("Copyright (C) 1992-2003 I. Lee Hetherington, Eddie Kohler et al.\n\
+      printf("Copyright (C) 1992-2010 I. Lee Hetherington, Eddie Kohler et al.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1lib.c b/Build/source/utils/t1utils/t1utils-1.36/t1lib.c
index 0dac40eddc0..0dac40eddc0 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1lib.c
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1lib.c
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1lib.h b/Build/source/utils/t1utils/t1utils-1.36/t1lib.h
index 93859fea731..93859fea731 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1lib.h
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1lib.h
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1mac.1 b/Build/source/utils/t1utils/t1utils-1.36/t1mac.1
index 872acb7c27b..9260ac04fd7 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1mac.1
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1mac.1
@@ -1,4 +1,4 @@
-.ds V 1.35
+.ds V 1.36
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1mac.c b/Build/source/utils/t1utils/t1utils-1.36/t1mac.c
index 18521d3de60..a86c5e05c10 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1mac.c
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1mac.c
@@ -890,7 +890,7 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("t1mac (LCDF t1utils) %s\n", VERSION);
-      printf("Copyright (C) 2000-2003 Eddie Kohler et al.\n\
+      printf("Copyright (C) 2000-2010 Eddie Kohler et al.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1unmac.1 b/Build/source/utils/t1utils/t1utils-1.36/t1unmac.1
index 1814a5ec684..f427a63b490 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1unmac.1
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1unmac.1
@@ -1,4 +1,4 @@
-.ds V 1.35
+.ds V 1.36
 .de M
 .BR "\\$1" "(\\$2)\\$3"
 ..
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1unmac.c b/Build/source/utils/t1utils/t1utils-1.36/t1unmac.c
index 73d524f2878..e1d27219851 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1unmac.c
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1unmac.c
@@ -611,7 +611,7 @@ main(int argc, char *argv[])
 
      case VERSION_OPT:
       printf("t1unmac (LCDF t1utils) %s\n", VERSION);
-      printf("Copyright (C) 1992-2003 I. Lee Hetherington, Eddie Kohler et al.\n\
+      printf("Copyright (C) 1992-2010 I. Lee Hetherington, Eddie Kohler et al.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty, not even for merchantability or fitness for a\n\
 particular purpose.\n");
diff --git a/Build/source/utils/t1utils/t1utils-1.35/t1utils.spec b/Build/source/utils/t1utils/t1utils-1.36/t1utils.spec
index 362193d6968..2baf95009cb 100644
--- a/Build/source/utils/t1utils/t1utils-1.35/t1utils.spec
+++ b/Build/source/utils/t1utils/t1utils-1.36/t1utils.spec
@@ -1,9 +1,9 @@
 Summary:	Programs for manipulating PostScript Type 1 fonts
 
 Name:		t1utils
-Version:	1.35
+Version:	1.36
 Release:	1
-Source:		http://www.lcdf.org/type/t1utils-1.35.tar.gz
+Source:		http://www.lcdf.org/type/t1utils-1.36.tar.gz
 
 URL:		http://www.lcdf.org/type/