diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-07-21 09:09:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-07-21 09:09:09 +0000 |
commit | 3cb619e188c5a94011e1d2b4a69566f8530761a8 (patch) | |
tree | a230a36fac08dd737a36e9c57a22ae023c08d4b0 /Build/source/utils | |
parent | b7fd66166a412f3c8e0dea7032b1ae643f731362 (diff) |
t1utils 1.37
git-svn-id: svn://tug.org/texlive/trunk@23195 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r-- | Build/source/utils/README | 4 | ||||
-rw-r--r-- | Build/source/utils/t1utils/ChangeLog | 14 | ||||
-rw-r--r-- | Build/source/utils/t1utils/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/config.h.in | 4 | ||||
-rwxr-xr-x | Build/source/utils/t1utils/configure | 24 | ||||
-rw-r--r-- | Build/source/utils/t1utils/configure.ac | 11 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37-PATCHES/ChangeLog (renamed from Build/source/utils/t1utils/t1utils-1.36-PATCHES/ChangeLog) | 7 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37-PATCHES/TL-Changes (renamed from Build/source/utils/t1utils/t1utils-1.36-PATCHES/TL-Changes) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37-PATCHES/patch-03-warnings (renamed from Build/source/utils/t1utils/t1utils-1.36-PATCHES/patch-03-warnings) | 12 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/INSTALL (renamed from Build/source/utils/t1utils/t1utils-1.36/INSTALL) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/Makefile.am (renamed from Build/source/utils/t1utils/t1utils-1.36/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/NEWS (renamed from Build/source/utils/t1utils/t1utils-1.36/NEWS) | 6 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/README (renamed from Build/source/utils/t1utils/t1utils-1.36/README) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/clp.c (renamed from Build/source/utils/t1utils/t1utils-1.36/clp.c) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/config.h.in (renamed from Build/source/utils/t1utils/t1utils-1.36/config.h.in) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/configure.ac (renamed from Build/source/utils/t1utils/t1utils-1.36/configure.ac) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/include/lcdf/clp.h (renamed from Build/source/utils/t1utils/t1utils-1.36/include/lcdf/clp.h) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/include/lcdf/inttypes.h (renamed from Build/source/utils/t1utils/t1utils-1.36/include/lcdf/inttypes.h) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1ascii.1 (renamed from Build/source/utils/t1utils/t1utils-1.36/t1ascii.1) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1ascii.c (renamed from Build/source/utils/t1utils/t1utils-1.36/t1ascii.c) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1asm.1 (renamed from Build/source/utils/t1utils/t1utils-1.36/t1asm.1) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1asm.c (renamed from Build/source/utils/t1utils/t1utils-1.36/t1asm.c) | 23 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1binary.1 (renamed from Build/source/utils/t1utils/t1utils-1.36/t1binary.1) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1binary.c (renamed from Build/source/utils/t1utils/t1utils-1.36/t1binary.c) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1disasm.1 (renamed from Build/source/utils/t1utils/t1utils-1.36/t1disasm.1) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1disasm.c (renamed from Build/source/utils/t1utils/t1utils-1.36/t1disasm.c) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1lib.c (renamed from Build/source/utils/t1utils/t1utils-1.36/t1lib.c) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1lib.h (renamed from Build/source/utils/t1utils/t1utils-1.36/t1lib.h) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1mac.1 (renamed from Build/source/utils/t1utils/t1utils-1.36/t1mac.1) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1mac.c (renamed from Build/source/utils/t1utils/t1utils-1.36/t1mac.c) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1unmac.1 (renamed from Build/source/utils/t1utils/t1utils-1.36/t1unmac.1) | 2 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1unmac.c (renamed from Build/source/utils/t1utils/t1utils-1.36/t1unmac.c) | 0 | ||||
-rw-r--r-- | Build/source/utils/t1utils/t1utils-1.37/t1utils.spec (renamed from Build/source/utils/t1utils/t1utils-1.36/t1utils.spec) | 4 | ||||
-rw-r--r-- | Build/source/utils/t1utils/version.ac | 11 |
34 files changed, 99 insertions, 45 deletions
diff --git a/Build/source/utils/README b/Build/source/utils/README index b1957b8a0f3..3df566ca03c 100644 --- a/Build/source/utils/README +++ b/Build/source/utils/README @@ -12,7 +12,7 @@ asymptote 2.13 - checked 19jun11 chktex 1.6.4 - checked 25apr11 http://baruch.ev-en.org/proj/chktex/chktex-1.6.4.tar.gz -dialog 1.1-20110302 - checked 25apr11 +dialog 1.1-20110707 - checked 21jul11 ftp://invisible-island.net/dialog/dialog.tar.gz ps2eps 1.68 - checked 25apr11 @@ -25,7 +25,7 @@ psutils p17 - checked 25apr11 -> http://www.connochaetos.org/misc/psutils-libre-1.17.tar.gz (Fabrice made small modifications for Windows, it seems) -t1utils 1.36 - checked 25apr11 +t1utils 1.37 - checked 21jul11 http://www.lcdf.org/type/ tpic2pdftex 1.97 - checked 25apr11 diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog index 92fa74c2f75..83c1021d1cc 100644 --- a/Build/source/utils/t1utils/ChangeLog +++ b/Build/source/utils/t1utils/ChangeLog @@ -1,3 +1,17 @@ +2011-07-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import t1utils-1.37. + * version.ac: New file defining the t1utils version. + * configure.ac: Adapt. + +2010-06-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: t1utils-1.36. + +2010-05-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: t1utils-1.35. + 2009-11-03 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac: Proxy build system for TeX Live, diff --git a/Build/source/utils/t1utils/Makefile.in b/Build/source/utils/t1utils/Makefile.in index 9c449140065..d52ec650f8c 100644 --- a/Build/source/utils/t1utils/Makefile.in +++ b/Build/source/utils/t1utils/Makefile.in @@ -47,7 +47,7 @@ DIST_COMMON = $(am__configure_deps) $(dist_man_MANS) \ ../../build-aux/ylwrap ChangeLog strerror.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/version.ac $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/Build/source/utils/t1utils/config.h.in b/Build/source/utils/t1utils/config.h.in index 2b2e4f83bb6..e4e905cd10c 100644 --- a/Build/source/utils/t1utils/config.h.in +++ b/Build/source/utils/t1utils/config.h.in @@ -95,4 +95,8 @@ extern "C" { char *strerror(int errno); #endif +#ifdef __cplusplus +} +#endif + #endif /* T1UTILS_CONFIG_H */ diff --git a/Build/source/utils/t1utils/configure b/Build/source/utils/t1utils/configure index 56483b1c592..f6f3165e5b9 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.68 for t1utils for TeX Live 1.36. +# Generated by GNU Autoconf 2.68 for t1utils for TeX Live 1.37. # # Report bugs to <tex-k@tug.org>. # @@ -560,12 +560,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='t1utils for TeX Live' PACKAGE_TARNAME='t1utils-for-tex-live' -PACKAGE_VERSION='1.36' -PACKAGE_STRING='t1utils for TeX Live 1.36' +PACKAGE_VERSION='1.37' +PACKAGE_STRING='t1utils for TeX Live 1.37' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="t1utils-1.36/t1ascii.c" +ac_unique_file="t1utils-1.37/t1ascii.c" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1249,7 +1249,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.36 to adapt to many kinds of systems. +\`configure' configures t1utils for TeX Live 1.37 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1316,7 +1316,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of t1utils for TeX Live 1.36:";; + short | recursive ) echo "Configuration of t1utils for TeX Live 1.37:";; esac cat <<\_ACEOF @@ -1408,7 +1408,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -t1utils for TeX Live configure 1.36 +t1utils for TeX Live configure 1.37 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2009,7 +2009,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.36, which was +It was created by t1utils for TeX Live $as_me 1.37, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2828,7 +2828,7 @@ fi # Define the identity of the package. PACKAGE='t1utils-for-tex-live' - VERSION='1.36' + VERSION='1.37' cat >>confdefs.h <<_ACEOF @@ -4662,7 +4662,7 @@ ac_config_headers="$ac_config_headers config.h" -T1UTILS_TREE=t1utils-1.36 +T1UTILS_TREE=t1utils-1.37 @@ -5206,7 +5206,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.36, which was +This file was extended by t1utils for TeX Live $as_me 1.37, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5272,7 +5272,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.36 +t1utils for TeX Live config.status 1.37 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/Build/source/utils/t1utils/configure.ac b/Build/source/utils/t1utils/configure.ac index 1c63068adba..441b73b79b8 100644 --- a/Build/source/utils/t1utils/configure.ac +++ b/Build/source/utils/t1utils/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2011 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, @@ -12,7 +12,7 @@ dnl Adapted for TeX Live from t1utils-1.34/configure.in dnl dnl ********************************************************************* dnl -m4_define([t1utils_version], [1.36])[]dnl using unmodified t1utils source tree +m4_include([version.ac])[] dnl define t1utils_version AC_INIT([t1utils for TeX Live], t1utils_version, [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([t1utils-]t1utils_version[/t1ascii.c]) @@ -108,10 +108,13 @@ extern "C" { char *strerror(int errno); #endif +#ifdef __cplusplus +} +#endif + #endif /* T1UTILS_CONFIG_H */]) -T1UTILS_TREE=[t1utils-]t1utils_version -AC_SUBST([T1UTILS_TREE]) +AC_SUBST([T1UTILS_TREE], [t1utils-]t1utils_version) dnl dnl Output diff --git a/Build/source/utils/t1utils/t1utils-1.36-PATCHES/ChangeLog b/Build/source/utils/t1utils/t1utils-1.37-PATCHES/ChangeLog index b4b84291fa3..00434bf5400 100644 --- a/Build/source/utils/t1utils/t1utils-1.36-PATCHES/ChangeLog +++ b/Build/source/utils/t1utils/t1utils-1.37-PATCHES/ChangeLog @@ -1,6 +1,11 @@ +2011-07-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to t1utils-1.37. + * patch-03-warnings: Adapted. + 2010-06-07 Peter Breitenlohner <peb@mppmu.mpg.de> - Adapt to t1utils-1.35. + Adapt to t1utils-1.36. * patch-02-static (removed): Now handled in original sources. * patch-03-warnings: Adapted, now mostly in original sources. diff --git a/Build/source/utils/t1utils/t1utils-1.36-PATCHES/TL-Changes b/Build/source/utils/t1utils/t1utils-1.37-PATCHES/TL-Changes index 9ae1d0e2b73..dbe6169b203 100644 --- a/Build/source/utils/t1utils/t1utils-1.36-PATCHES/TL-Changes +++ b/Build/source/utils/t1utils/t1utils-1.37-PATCHES/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the t1utils-1.36 tree as obtained from: +Changes applied to the t1utils-1.37 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.37-PATCHES/patch-03-warnings index e95d901c213..ccbbfcc2da3 100644 --- a/Build/source/utils/t1utils/t1utils-1.36-PATCHES/patch-03-warnings +++ b/Build/source/utils/t1utils/t1utils-1.37-PATCHES/patch-03-warnings @@ -1,8 +1,8 @@ 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 +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 @@ parse_int(Clp_Parser *clp, const char *arg, int complain, void *user_data) { @@ -53,9 +53,9 @@ diff -ur t1utils-1.36.orig/clp.c t1utils-1.36/clp.c 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 +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 @@ /* 23.Feb.2004 - use 'memstr', not strstr, because the strings input to eexec_line aren't null terminated! Reported by Werner Lemberg. */ diff --git a/Build/source/utils/t1utils/t1utils-1.36/INSTALL b/Build/source/utils/t1utils/t1utils-1.37/INSTALL index 95d84c820fb..95d84c820fb 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/INSTALL +++ b/Build/source/utils/t1utils/t1utils-1.37/INSTALL diff --git a/Build/source/utils/t1utils/t1utils-1.36/Makefile.am b/Build/source/utils/t1utils/t1utils-1.37/Makefile.am index b294bea08ed..b294bea08ed 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/Makefile.am +++ b/Build/source/utils/t1utils/t1utils-1.37/Makefile.am diff --git a/Build/source/utils/t1utils/t1utils-1.36/NEWS b/Build/source/utils/t1utils/t1utils-1.37/NEWS index 9a3b30c7d06..783015e136f 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/NEWS +++ b/Build/source/utils/t1utils/t1utils-1.37/NEWS @@ -1,5 +1,11 @@ T1utils NEWS +Version 1.37 29.Jun.2011 + +* t1asm: Use a dynamically allocated buffer to handle huge characters + (reported by Werner Lemberg). + + Version 1.36 29.May.2010 * Several minor cleanups. diff --git a/Build/source/utils/t1utils/t1utils-1.36/README b/Build/source/utils/t1utils/t1utils-1.37/README index 0f7415491be..27877155a81 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/README +++ b/Build/source/utils/t1utils/t1utils-1.37/README @@ -1,4 +1,4 @@ -T1UTILS VERSION 1.36 NOTES +T1UTILS VERSION 1.37 NOTES ========================== You need an ANSI C compiler, such as gcc. diff --git a/Build/source/utils/t1utils/t1utils-1.36/clp.c b/Build/source/utils/t1utils/t1utils-1.37/clp.c index ae17c9acd9c..ce9cfc66325 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/clp.c +++ b/Build/source/utils/t1utils/t1utils-1.37/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-2010 Eddie Kohler, ekohler@gmail.com + * Copyright (c) 1997-2011 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"), diff --git a/Build/source/utils/t1utils/t1utils-1.36/config.h.in b/Build/source/utils/t1utils/t1utils-1.37/config.h.in index 76389dfbfe6..76389dfbfe6 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/config.h.in +++ b/Build/source/utils/t1utils/t1utils-1.37/config.h.in diff --git a/Build/source/utils/t1utils/t1utils-1.36/configure.ac b/Build/source/utils/t1utils/t1utils-1.37/configure.ac index 8787d3850de..4244bb2c9ad 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/configure.ac +++ b/Build/source/utils/t1utils/t1utils-1.37/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.36) +AM_INIT_AUTOMAKE(t1utils, 1.37) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff --git a/Build/source/utils/t1utils/t1utils-1.36/include/lcdf/clp.h b/Build/source/utils/t1utils/t1utils-1.37/include/lcdf/clp.h index 15476d52d35..233182d76dc 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/include/lcdf/clp.h +++ b/Build/source/utils/t1utils/t1utils-1.37/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-2010 Eddie Kohler, ekohler@gmail.com + * Copyright (c) 1997-2011 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"), diff --git a/Build/source/utils/t1utils/t1utils-1.36/include/lcdf/inttypes.h b/Build/source/utils/t1utils/t1utils-1.37/include/lcdf/inttypes.h index b88e9e9faf0..b88e9e9faf0 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/include/lcdf/inttypes.h +++ b/Build/source/utils/t1utils/t1utils-1.37/include/lcdf/inttypes.h diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1ascii.1 b/Build/source/utils/t1utils/t1utils-1.37/t1ascii.1 index 15e54fa2a77..0ee3b6e5db8 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1ascii.1 +++ b/Build/source/utils/t1utils/t1utils-1.37/t1ascii.1 @@ -1,4 +1,4 @@ -.ds V 1.36 +.ds V 1.37 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1ascii.c b/Build/source/utils/t1utils/t1utils-1.37/t1ascii.c index 7e256d28e93..7e256d28e93 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1ascii.c +++ b/Build/source/utils/t1utils/t1utils-1.37/t1ascii.c diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1asm.1 b/Build/source/utils/t1utils/t1utils-1.37/t1asm.1 index e25613b7cdf..12e79a3729c 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1asm.1 +++ b/Build/source/utils/t1utils/t1utils-1.37/t1asm.1 @@ -1,4 +1,4 @@ -.ds V 1.36 +.ds V 1.37 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1asm.c b/Build/source/utils/t1utils/t1utils-1.37/t1asm.c index 488a5b39f57..d59a5bcd633 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1asm.c +++ b/Build/source/utils/t1utils/t1utils-1.37/t1asm.c @@ -92,8 +92,8 @@ static int lenIV = 4; static char cs_start[10]; /* for charstring buffering */ -static byte charstring_buf[65535]; -static byte *charstring_bp; +static byte *charstring_buf, *charstring_bp; +static int charstring_bufsiz; /* decryption stuff */ static uint16_t er, cr; @@ -109,6 +109,7 @@ static struct command { { "and", 12, 3 }, /* Type 2 */ { "blend", 16, -1 }, /* Type 2 */ { "callgsubr", 29, -1 }, /* Type 2 */ + { "callother", 12, 16 }, /* Type 1 ONLY */ { "callothersubr", 12, 16 }, /* Type 1 ONLY */ { "callsubr", 10, -1 }, { "closepath", 9, -1 }, /* Type 1 ONLY */ @@ -371,6 +372,12 @@ static void charstring_start(void) { int i; + if (!charstring_buf) { + charstring_bufsiz = 65536; + if (!(charstring_buf = (byte *) malloc(charstring_bufsiz))) + fatal_error("out of memory"); + } + charstring_bp = charstring_buf; cr = 4330; for (i = 0; i < lenIV; i++) @@ -381,10 +388,14 @@ static void charstring_start(void) static void charstring_byte(int v) { - byte b = (byte)(v & 0xff); - if (charstring_bp - charstring_buf > (int)sizeof(charstring_buf)) - fatal_error("charstring buffer overflow"); - *charstring_bp++ = cencrypt(b); + byte b = (byte)(v & 0xff); + if (charstring_bp - charstring_buf == charstring_bufsiz) { + charstring_bufsiz *= 2; + if (!(charstring_buf = (byte *) realloc(charstring_buf, charstring_bufsiz))) + fatal_error("out of memory"); + charstring_bp = charstring_buf + charstring_bufsiz / 2; + } + *charstring_bp++ = cencrypt(b); } /* This function outputs buffered, encrypted charstring data through possible diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1binary.1 b/Build/source/utils/t1utils/t1utils-1.37/t1binary.1 index e84afc7730d..8f55e93c48d 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1binary.1 +++ b/Build/source/utils/t1utils/t1utils-1.37/t1binary.1 @@ -1,4 +1,4 @@ -.ds V 1.36 +.ds V 1.37 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1binary.c b/Build/source/utils/t1utils/t1utils-1.37/t1binary.c index 8120fa51da4..8120fa51da4 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1binary.c +++ b/Build/source/utils/t1utils/t1utils-1.37/t1binary.c diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1disasm.1 b/Build/source/utils/t1utils/t1utils-1.37/t1disasm.1 index 29ad9949413..4458fb46ea1 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1disasm.1 +++ b/Build/source/utils/t1utils/t1utils-1.37/t1disasm.1 @@ -1,4 +1,4 @@ -.ds V 1.36 +.ds V 1.37 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1disasm.c b/Build/source/utils/t1utils/t1utils-1.37/t1disasm.c index 25318a96ee2..25318a96ee2 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1disasm.c +++ b/Build/source/utils/t1utils/t1utils-1.37/t1disasm.c diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1lib.c b/Build/source/utils/t1utils/t1utils-1.37/t1lib.c index 0dac40eddc0..0dac40eddc0 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1lib.c +++ b/Build/source/utils/t1utils/t1utils-1.37/t1lib.c diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1lib.h b/Build/source/utils/t1utils/t1utils-1.37/t1lib.h index 93859fea731..93859fea731 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1lib.h +++ b/Build/source/utils/t1utils/t1utils-1.37/t1lib.h diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1mac.1 b/Build/source/utils/t1utils/t1utils-1.37/t1mac.1 index 9260ac04fd7..4a759716e51 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1mac.1 +++ b/Build/source/utils/t1utils/t1utils-1.37/t1mac.1 @@ -1,4 +1,4 @@ -.ds V 1.36 +.ds V 1.37 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1mac.c b/Build/source/utils/t1utils/t1utils-1.37/t1mac.c index a86c5e05c10..a86c5e05c10 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1mac.c +++ b/Build/source/utils/t1utils/t1utils-1.37/t1mac.c diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1unmac.1 b/Build/source/utils/t1utils/t1utils-1.37/t1unmac.1 index f427a63b490..081ec31569f 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1unmac.1 +++ b/Build/source/utils/t1utils/t1utils-1.37/t1unmac.1 @@ -1,4 +1,4 @@ -.ds V 1.36 +.ds V 1.37 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1unmac.c b/Build/source/utils/t1utils/t1utils-1.37/t1unmac.c index e1d27219851..e1d27219851 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1unmac.c +++ b/Build/source/utils/t1utils/t1utils-1.37/t1unmac.c diff --git a/Build/source/utils/t1utils/t1utils-1.36/t1utils.spec b/Build/source/utils/t1utils/t1utils-1.37/t1utils.spec index 2baf95009cb..579e8c8e7e6 100644 --- a/Build/source/utils/t1utils/t1utils-1.36/t1utils.spec +++ b/Build/source/utils/t1utils/t1utils-1.37/t1utils.spec @@ -1,9 +1,9 @@ Summary: Programs for manipulating PostScript Type 1 fonts Name: t1utils -Version: 1.36 +Version: 1.37 Release: 1 -Source: http://www.lcdf.org/type/t1utils-1.36.tar.gz +Source: http://www.lcdf.org/type/t1utils-1.37.tar.gz URL: http://www.lcdf.org/type/ diff --git a/Build/source/utils/t1utils/version.ac b/Build/source/utils/t1utils/version.ac new file mode 100644 index 00000000000..c52f29a735b --- /dev/null +++ b/Build/source/utils/t1utils/version.ac @@ -0,0 +1,11 @@ +dnl +dnl Copyright (C) 2011 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, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl -------------------------------------------------------- +dnl +dnl m4-include this file to define the current t1utils version +m4_define([t1utils_version], [1.37]) |