summaryrefslogtreecommitdiff
path: root/Build/source/texk/lcdf-typetools/t1reencode
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-20 09:50:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-20 09:50:07 +0000
commit82150b6fc41b8a3446f2c6020ddf5625956dd708 (patch)
tree9234f85d00b9fd322b0986b62f09e355449190e6 /Build/source/texk/lcdf-typetools/t1reencode
parent6b3b122ab7e6994e0b4c8d1299eb2c3462388542 (diff)
new build system
git-svn-id: svn://tug.org/texlive/trunk@12456 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools/t1reencode')
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/Makefile.am2
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/Makefile.in130
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/md5.c4
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/t1reencode.14
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc108
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/util.cc8
6 files changed, 160 insertions, 96 deletions
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.am b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.am
index 8dcf9da887d..754e44b6d5a 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.am
@@ -1,6 +1,4 @@
## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = foreign
-
bin_PROGRAMS = t1reencode
man_MANS = t1reencode.1
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
index 7ed1ab495b7..159c21412d9 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30,11 +30,19 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
bin_PROGRAMS = t1reencode$(EXEEXT)
subdir = t1reencode
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
+ $(top_srcdir)/m4/kpse-common.m4 \
+ $(top_srcdir)/m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -48,17 +56,26 @@ am_t1reencode_OBJECTS = md5.$(OBJEXT) t1reencode.$(OBJEXT) \
t1reencode_OBJECTS = $(am_t1reencode_OBJECTS)
t1reencode_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
- -o $@
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
SOURCES = $(t1reencode_SOURCES)
DIST_SOURCES = $(t1reencode_SOURCES)
man1dir = $(mandir)/man1
@@ -69,6 +86,7 @@ CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -85,29 +103,40 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FIXLIBC_O = @FIXLIBC_O@
+FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPSEINTERFACE_O = @KPSEINTERFACE_O@
+KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
+KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
+KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBKPATHSEA = @LIBKPATHSEA@
-LIBKPATHSEA_DEP = @LIBKPATHSEA_DEP@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -116,6 +145,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -128,20 +158,29 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+build = @build@
build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+host = @host@
host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -150,6 +189,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -165,7 +205,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign
man_MANS = t1reencode.1
t1reencode_SOURCES = md5.c md5.h \
t1reencode.cc \
@@ -178,13 +217,13 @@ EXTRA_DIST = t1reencode.1
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .cc .o .obj
+.SUFFIXES: .c .cc .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -214,10 +253,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
+ || test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -230,7 +270,11 @@ uninstall-binPROGRAMS:
done
clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
t1reencode$(EXEEXT): $(t1reencode_OBJECTS) $(t1reencode_DEPENDENCIES)
@rm -f t1reencode$(EXEEXT)
$(CXXLINK) $(t1reencode_OBJECTS) $(t1reencode_LDADD) $(LIBS)
@@ -259,6 +303,13 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+.c.lo:
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
.cc.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -272,6 +323,19 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@@ -323,7 +387,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -425,7 +489,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -468,7 +532,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
pdf: pdf-am
@@ -485,18 +550,19 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-man uninstall-man1
+ clean-generic clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/md5.c b/Build/source/texk/lcdf-typetools/t1reencode/md5.c
index d9fbd7510e2..107de8061c2 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/md5.c
+++ b/Build/source/texk/lcdf-typetools/t1reencode/md5.c
@@ -119,7 +119,7 @@ transform(MD5_CONTEXT *ctx, const unsigned char *data)
#define OP(a, b, c, d, s, T) \
do { \
- a += FF (b, c, d) + (*cwp++) + T; \
+ a += FF (b, c, d) + (*cwp++) + T; \
a = rol(a, s); \
a += b; \
} while (0)
@@ -153,7 +153,7 @@ transform(MD5_CONTEXT *ctx, const unsigned char *data)
do { \
a += f (b, c, d) + correct_words[k] + T; \
a = rol(a, s); \
- a += b; \
+ a += b; \
} while (0)
/* Round 2. */
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
index 7914363f2d1..b2736233593 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
+++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
@@ -1,4 +1,4 @@
-.ds V 2.69
+.ds V 2.75
.de M
.BR "\\$1" "(\\$2)\\$3"
..
@@ -202,4 +202,4 @@ option). The new font will be called WarnockPro-RegularOsF.
.M otftotfm 1
'
.SH AUTHOR
-Eddie Kohler (kohler@cs.ucla.edu)
+Eddie Kohler (ekohler@gmail.com)
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
index 6a4eedf622a..d81d26221c4 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
+++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
@@ -1,6 +1,6 @@
/* t1reencode.cc -- driver for reencoding Type 1 fonts
*
- * Copyright (c) 2005-2006 Eddie Kohler
+ * Copyright (c) 2005-2009 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -64,7 +64,6 @@ const Clp_Option options[] = {
static const char *program_name;
static PermString::Initializer initializer;
-static String::Initializer initializer2;
static HashMap<PermString, int> glyph_order(-1);
static String encoding_name;
@@ -636,7 +635,7 @@ usage_error(ErrorHandler *errh, const char *error_message, ...)
if (!error_message)
errh->message("Usage: %s [OPTION]... FONT", program_name);
else
- errh->verror(ErrorHandler::ERR_ERROR, String(), error_message, val);
+ errh->vxmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -644,8 +643,9 @@ usage_error(ErrorHandler *errh, const char *error_message, ...)
void
usage()
{
- printf("\
-'T1reencode' changes a Type 1 font's embedded encoding and writes the\n\
+ FileErrorHandler uerrh(stdout);
+ uerrh.message("\
+%<T1reencode%> changes a Type 1 font%,s embedded encoding and writes the\n\
reencoded font to the standard output.\n\
\n\
Usage: %s [OPTION]... [FONTFILE [OUTPUTFILE]]\n\
@@ -653,15 +653,15 @@ Usage: %s [OPTION]... [FONTFILE [OUTPUTFILE]]\n\
Options:\n\
-e, --encoding=FILE Read the encoding from FILE (in DVIPS format).\n\
-E, --encoding-text=ENC The ENC argument is the encoding text.\n\
- -n, --name=NAME Set output font's PostScript name.\n\
- -N, --full-name=NAME Set output font's full name.\n\
+ -n, --name=NAME Set output font%,s PostScript name.\n\
+ -N, --full-name=NAME Set output font%,s full name.\n\
-a, --pfa Output PFA font.\n\
-b, --pfb Output PFB font. This is the default.\n\
-o, --output=FILE Write output to FILE instead of standard out.\n\
-h, --help Print this message and exit.\n\
--version Print version number and exit.\n\
\n\
-Report bugs to <kohler@cs.ucla.edu>.\n", program_name);
+Report bugs to <ekohler@gmail.com>.\n", program_name);
}
@@ -672,7 +672,7 @@ kill_def(Type1Font* font, Type1Definition *t1d, int whichd)
{
if (!t1d || font->dict(whichd, t1d->name()) != t1d)
return;
-
+
int icount = font->nitems();
for (int i = font->first_dict_item(whichd); i < icount; i++)
if (font->item(i) == t1d) {
@@ -685,7 +685,7 @@ kill_def(Type1Font* font, Type1Definition *t1d, int whichd)
font->set_dict(whichd, name, 0);
return;
}
-
+
assert(0);
}
@@ -699,14 +699,14 @@ adjust_font_definitions(Type1Font* font, Type1Encoding* encoding, String new_nam
MD5_CONTEXT md5;
md5_init(&md5);
md5_update(&md5, (const unsigned char*) etext.data(), etext.length() - 1);
-
+
// save UniqueID, then kill its definition
int uniqueid;
Type1Definition *t1d = font->dict("UniqueID");
bool have_uniqueid = (t1d && t1d->value_int(uniqueid));
kill_def(font, t1d, Type1Font::dFont);
kill_def(font, font->p_dict("UniqueID"), Type1Font::dPrivate);
-
+
// prepare XUID
t1d = font->dict("XUID");
Vector<double> xuid;
@@ -725,7 +725,7 @@ adjust_font_definitions(Type1Font* font, Type1Encoding* encoding, String new_nam
uint8_t digest[MD5_DIGEST_SIZE + 2]; // leave 2 bytes of space
md5_final((unsigned char *) digest, &md5);
digest[MD5_DIGEST_SIZE] = digest[MD5_DIGEST_SIZE + 1] = 0;
-
+
// append digest to XUID; each element must be less than 2^24
for (int i = 0; i < MD5_DIGEST_SIZE; i += 3)
xuid.push_back((digest[i] << 16) | (digest[i+1] << 8) | digest[i+2]);
@@ -738,7 +738,7 @@ adjust_font_definitions(Type1Font* font, Type1Encoding* encoding, String new_nam
md5_final_text(text_digest, &md5);
encoding_name = "AutoEnc_" + String(text_digest);
}
-
+
t1d = font->dict("FontName");
PermString name;
if (t1d && t1d->value_name(name)) {
@@ -766,7 +766,7 @@ adjust_font_definitions(Type1Font* font, Type1Encoding* encoding, String new_nam
sa << "%% Created by t1reencode-" VERSION " on " << time_str;
sa.pop_back();
#else
- sa << "%% Created by t1reencode-" VERSION ".";
+ sa << "%% Created by t1reencode-" VERSION ".";
#endif
font->add_header_comment(sa.take_string().c_str());
@@ -792,7 +792,7 @@ tokenize(const String &s, int &pos_in, int &line)
line++;
pos++;
}
-
+
if (pos >= len) {
pos_in = len;
return String();
@@ -835,7 +835,7 @@ tokenize(const String &s, int &pos_in, int &line)
static String
landmark(const String &filename, int line)
{
- return filename + String::stable_string(":", 1) + String(line);
+ return filename + String::make_stable(":", 1) + String(line);
}
Type1Encoding *
@@ -890,16 +890,16 @@ do_file(const char *filename, PsresDatabase *psres, ErrorHandler *errh)
#endif
} else
f = fopen(filename, "rb");
-
+
if (!f) {
// check for PostScript name
Filename fn = psres->filename_value("FontOutline", filename);
f = fn.open_read();
}
-
+
if (!f)
errh->fatal("%s: %s", filename, strerror(errno));
-
+
Type1Reader *reader;
int c = getc(f);
ungetc(c, f);
@@ -909,7 +909,7 @@ do_file(const char *filename, PsresDatabase *psres, ErrorHandler *errh)
reader = new Type1PFBReader(f);
else
reader = new Type1PFAReader(f);
-
+
Type1Font *font = new Type1Font(*reader);
if (!font->ok())
errh->fatal("%s: no glyphs in font", filename);
@@ -923,11 +923,11 @@ main(int argc, char *argv[])
{
PsresDatabase *psres = new PsresDatabase;
psres->add_psres_path(getenv("PSRESOURCEPATH"), 0, false);
-
+
Clp_Parser *clp =
Clp_NewParser(argc, (const char * const *)argv, sizeof(options) / sizeof(options[0]), options);
program_name = Clp_ProgramName(clp);
-
+
ErrorHandler *errh = ErrorHandler::static_initialize(new FileErrorHandler(stderr));
const char *input_file = 0;
const char *output_file = 0;
@@ -937,7 +937,7 @@ main(int argc, char *argv[])
const char *new_full_name = 0;
bool binary = true;
Vector<String> glyph_patterns;
-
+
while (1) {
int opt = Clp_Next(clp);
switch (opt) {
@@ -965,7 +965,7 @@ main(int argc, char *argv[])
errh->fatal("full name already specified");
new_full_name = clp->vstr;
break;
-
+
case OUTPUT_OPT:
if (output_file)
errh->fatal("output file already specified");
@@ -979,21 +979,21 @@ main(int argc, char *argv[])
case PFB_OPT:
binary = true;
break;
-
+
case VERSION_OPT:
printf("t1reencode (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1999-2006 Eddie Kohler\n\
+ printf("Copyright (C) 1999-2009 Eddie Kohler\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");
exit(0);
break;
-
+
case HELP_OPT:
usage();
exit(0);
break;
-
+
case Clp_NotOption:
if (input_file && output_file)
errh->fatal("too many arguments");
@@ -1002,20 +1002,20 @@ particular purpose.\n");
else
input_file = clp->vstr;
break;
-
+
case Clp_Done:
goto done;
-
+
case Clp_BadOption:
usage_error(errh, 0);
break;
-
+
default:
break;
-
+
}
}
-
+
done:
// read the font
Type1Font *font = do_file(input_file, psres, errh);
@@ -1024,59 +1024,59 @@ particular purpose.\n");
// read the encoding
if (!encoding_file && !encoding_text)
- errh->fatal("missing '-e ENCODING' argument");
+ errh->fatal("missing %<-e ENCODING%> argument");
Type1Encoding *t1e = 0;
- if (encoding_file == "StandardEncoding") {
+ if (strcmp(encoding_file, "StandardEncoding") == 0) {
t1e = Type1Encoding::standard_encoding();
encoding_name = encoding_file;
} else {
String text;
if (strcmp(encoding_file, "ISOLatin1Encoding") == 0
|| strcmp(encoding_file, "ISO_8859_1_Encoding") == 0)
- text = String::stable_string(ISOLatin1Encoding);
+ text = String::make_stable(ISOLatin1Encoding);
else if (strcmp(encoding_file, "ISOLatin2Encoding") == 0
|| strcmp(encoding_file, "ISO_8859_2_Encoding") == 0)
- text = String::stable_string(ISOLatin2Encoding);
+ text = String::make_stable(ISOLatin2Encoding);
else if (strcmp(encoding_file, "ISOLatin3Encoding") == 0
|| strcmp(encoding_file, "ISO_8859_3_Encoding") == 0)
- text = String::stable_string(ISOLatin3Encoding);
+ text = String::make_stable(ISOLatin3Encoding);
else if (strcmp(encoding_file, "ISOLatin4Encoding") == 0
|| strcmp(encoding_file, "ISO_8859_4_Encoding") == 0)
- text = String::stable_string(ISOLatin4Encoding);
+ text = String::make_stable(ISOLatin4Encoding);
else if (strcmp(encoding_file, "ISOCyrillicEncoding") == 0
|| strcmp(encoding_file, "ISO_8859_5_Encoding") == 0)
- text = String::stable_string(ISOCyrillicEncoding);
+ text = String::make_stable(ISOCyrillicEncoding);
else if (strcmp(encoding_file, "ISOGreekEncoding") == 0
|| strcmp(encoding_file, "ISO_8859_7_Encoding") == 0)
- text = String::stable_string(ISOGreekEncoding);
+ text = String::make_stable(ISOGreekEncoding);
else if (strcmp(encoding_file, "ISO_8859_9_Encoding") == 0
|| strcmp(encoding_file, "ISOLatin5Encoding") == 0)
- text = String::stable_string(ISOLatin5Encoding);
+ text = String::make_stable(ISOLatin5Encoding);
else if (strcmp(encoding_file, "ISOLatin6Encoding") == 0
|| strcmp(encoding_file, "ISO_8859_10_Encoding") == 0)
- text = String::stable_string(ISOLatin6Encoding);
+ text = String::make_stable(ISOLatin6Encoding);
else if (strcmp(encoding_file, "ISOThaiEncoding") == 0
|| strcmp(encoding_file, "ISO_8859_11_Encoding") == 0)
- text = String::stable_string(ISOThaiEncoding);
+ text = String::make_stable(ISOThaiEncoding);
else if (strcmp(encoding_file, "ISOLatin7Encoding") == 0
|| strcmp(encoding_file, "ISO_8859_13_Encoding") == 0)
- text = String::stable_string(ISOLatin7Encoding);
+ text = String::make_stable(ISOLatin7Encoding);
else if (strcmp(encoding_file, "ISOLatin8Encoding") == 0
|| strcmp(encoding_file, "ISO_8859_14_Encoding") == 0)
- text = String::stable_string(ISOLatin8Encoding);
+ text = String::make_stable(ISOLatin8Encoding);
else if (strcmp(encoding_file, "ISOLatin9Encoding") == 0
|| strcmp(encoding_file, "ISO_8859_15_Encoding") == 0)
- text = String::stable_string(ISOLatin9Encoding);
+ text = String::make_stable(ISOLatin9Encoding);
else if (strcmp(encoding_file, "KOI8REncoding") == 0)
- text = String::stable_string(KOI8REncoding);
+ text = String::make_stable(KOI8REncoding);
else if (strcmp(encoding_file, "ExpertEncoding") == 0)
- text = String::stable_string(ExpertEncoding);
+ text = String::make_stable(ExpertEncoding);
else if (strcmp(encoding_file, "ExpertSubsetEncoding") == 0)
- text = String::stable_string(ExpertSubsetEncoding);
+ text = String::make_stable(ExpertSubsetEncoding);
else if (strcmp(encoding_file, "SymbolEncoding") == 0)
- text = String::stable_string(SymbolEncoding);
+ text = String::make_stable(SymbolEncoding);
else if (encoding_text)
- text = String::stable_string(encoding_text), encoding_file = "<argument>";
+ text = String::make_stable(encoding_text), encoding_file = "<argument>";
else if ((text = read_file(encoding_file, errh)), errh->nerrors() > 0)
exit(1);
if (!(t1e = parse_encoding(text, encoding_file, errh)))
@@ -1108,6 +1108,6 @@ particular purpose.\n");
Type1PFAWriter w(outf);
font->write(w);
}
-
+
return (errh->nerrors() == 0 ? 0 : 1);
}
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/util.cc b/Build/source/texk/lcdf-typetools/t1reencode/util.cc
index 7792eef4466..a8dc4c48ea7 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/util.cc
+++ b/Build/source/texk/lcdf-typetools/t1reencode/util.cc
@@ -38,17 +38,17 @@ read_file(String filename, ErrorHandler *errh, bool warning)
_setmode(_fileno(f), _O_BINARY);
#endif
} else if (!(f = fopen(filename.c_str(), "rb"))) {
- errh->verror_text((warning ? errh->ERR_WARNING : errh->ERR_ERROR), filename, strerror(errno));
+ errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), strerror(errno));
return String();
}
-
+
StringAccum sa;
while (!feof(f)) {
if (char *x = sa.reserve(8192)) {
int amt = fread(x, 1, 8192, f);
sa.forward(amt);
} else {
- errh->verror_text((warning ? errh->ERR_WARNING : errh->ERR_ERROR), filename, "Out of memory!");
+ errh->xmessage((warning ? errh->e_warning : errh->e_error) + ErrorHandler::make_landmark_anno(filename), "Out of memory!");
break;
}
}
@@ -61,7 +61,7 @@ String
printable_filename(const String &s)
{
if (!s || s == "-")
- return String::stable_string("<stdin>");
+ return String::make_stable("<stdin>");
else
return s;
}