texlive[41518] Build/source/texk/lcdf-typetools: lcdf-typetools 2.106
commits+kakuto at tug.org
commits+kakuto at tug.org
Wed Jun 22 08:25:09 CEST 2016
Revision: 41518
http://tug.org/svn/texlive?view=revision&revision=41518
Author: kakuto
Date: 2016-06-22 08:25:09 +0200 (Wed, 22 Jun 2016)
Log Message:
-----------
lcdf-typetools 2.106
Modified Paths:
--------------
trunk/Build/source/texk/lcdf-typetools/ChangeLog
trunk/Build/source/texk/lcdf-typetools/autoconf.h.in
trunk/Build/source/texk/lcdf-typetools/configure
trunk/Build/source/texk/lcdf-typetools/configure.ac
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/ChangeLog
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/TL-Changes
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-02-mingw64
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.am
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/README.md
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/autoconf.h.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/cfftot1.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/cfftot1.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/maket1font.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/configure.ac
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/glyphlist.txt
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/efont/t1csgen.hh
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/clp.h
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/error.hh
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/permstr.hh
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/vector.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/lcdf-typetools.spec
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afm.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afmparse.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afmw.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/amfm.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/encoding.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/findmet.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/metrics.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otf.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfcmap.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfdata.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfdescrip.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfgpos.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfgsub.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfname.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfos2.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfpost.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/pairop.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/psres.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1bounds.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1cs.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1csgen.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1font.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1fontskel.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1interp.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1item.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1mm.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1rw.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1unparser.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfcs.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfhead.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfkern.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/bezier.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/clp.c
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/error.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/filename.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/globmatch.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/landmark.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/permstr.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/point.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/slurper.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/straccum.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/string.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/transform.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/main.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/mmafm.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/main.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/mmpfb.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/myfont.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/t1minimize.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/t1rewrit.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/otfinfo.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/otfinfo.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/automatic.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/dvipsencoding.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/glyphfilter.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/kpseinterface.c
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/metrics.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/secondary.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/uniprop.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/util.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/t1dotlessj.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/t1dotlessj.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/cscheck.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/t1lint.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/t1lint.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/t1rawafm.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/t1rawafm.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/t1reencode.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/t1reencode.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/util.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/t1testpage.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/t1testpage.cc
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/Makefile.in
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/ttftotype42.1
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/ttftotype42.cc
trunk/Build/source/texk/lcdf-typetools/version.ac
Added Paths:
-----------
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-03-w32
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/NEWS.md
Removed Paths:
-------------
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-20-TL-binary
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-21-TL-paths
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-30-W32TeX
trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/NEWS
Modified: trunk/Build/source/texk/lcdf-typetools/ChangeLog
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/ChangeLog 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/ChangeLog 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,3 +1,8 @@
+2016-06-22 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import lcdf-typetools-2.106.
+ * configure.ac, version.ac: Adapted.
+
2016-02-23 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* Makefile.am, configure.ac: New convention.
Modified: trunk/Build/source/texk/lcdf-typetools/autoconf.h.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/autoconf.h.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/autoconf.h.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -12,6 +12,9 @@
/* Define if the va_list type is addressable. */
#undef HAVE_ADDRESSABLE_VA_LIST
+/* Define to incldue Adobe code in output fonts. */
+#undef HAVE_ADOBE_CODE
+
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
Modified: trunk/Build/source/texk/lcdf-typetools/configure
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/configure 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/configure 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for LCDF typetools (TeX Live) 2.105.
+# Generated by GNU Autoconf 2.69 for LCDF typetools (TeX Live) 2.106.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,12 +590,12 @@
# Identity of this package.
PACKAGE_NAME='LCDF typetools (TeX Live)'
PACKAGE_TARNAME='lcdf-typetools--tex-live-'
-PACKAGE_VERSION='2.105'
-PACKAGE_STRING='LCDF typetools (TeX Live) 2.105'
+PACKAGE_VERSION='2.106'
+PACKAGE_STRING='LCDF typetools (TeX Live) 2.106'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
-ac_unique_file="lcdf-typetools-src/NEWS"
+ac_unique_file="lcdf-typetools-src/NEWS.md"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1368,7 +1368,7 @@
# 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 LCDF typetools (TeX Live) 2.105 to adapt to many kinds of systems.
+\`configure' configures LCDF typetools (TeX Live) 2.106 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1439,7 +1439,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LCDF typetools (TeX Live) 2.105:";;
+ short | recursive ) echo "Configuration of LCDF typetools (TeX Live) 2.106:";;
esac
cat <<\_ACEOF
@@ -1468,6 +1468,7 @@
--enable-precondition-checking
include precondition checking assertions
--enable-cxx-runtime-hack link C++ runtime statically
+ --disable-adobe-code do not include Adobe code
--disable-cfftot1 do not build the cfftot1 program
--disable-mmafm do not build the mmafm program
--disable-mmpfb do not build the mmpfb program
@@ -1583,7 +1584,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LCDF typetools (TeX Live) configure 2.105
+LCDF typetools (TeX Live) configure 2.106
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2789,7 +2790,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by LCDF typetools (TeX Live) $as_me 2.105, which was
+It was created by LCDF typetools (TeX Live) $as_me 2.106, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8474,7 +8475,7 @@
# Define the identity of the package.
PACKAGE='lcdf-typetools--tex-live-'
- VERSION='2.105'
+ VERSION='2.106'
cat >>confdefs.h <<_ACEOF
@@ -14078,7 +14079,7 @@
-LCDF_TYPETOOLS_VERSION=2.105
+LCDF_TYPETOOLS_VERSION=2.106
ac_config_headers="$ac_config_headers autoconf.h"
@@ -17977,6 +17978,20 @@
fi
+# Check whether --enable-adobe-code was given.
+if test "${enable_adobe_code+set}" = set; then :
+ enableval=$enable_adobe_code;
+else
+ enable_adobe_code=yes
+fi
+
+if test "$enable_adobe_code" = yes; then
+
+$as_echo "#define HAVE_ADOBE_CODE 1" >>confdefs.h
+
+fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where template objects are stored" >&5
$as_echo_n "checking where template objects are stored... " >&6; }
if ${ac_cv_cxx_templobjs+:} false; then :
@@ -19928,7 +19943,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-LCDF typetools (TeX Live) config.lt 2.105
+LCDF typetools (TeX Live) config.lt 2.106
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -21996,7 +22011,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by LCDF typetools (TeX Live) $as_me 2.105, which was
+This file was extended by LCDF typetools (TeX Live) $as_me 2.106, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22062,7 +22077,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-LCDF typetools (TeX Live) config.status 2.105
+LCDF typetools (TeX Live) config.status 2.106
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/texk/lcdf-typetools/configure.ac
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/configure.ac 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/configure.ac 2016-06-22 06:25:09 UTC (rev 41518)
@@ -16,7 +16,7 @@
m4_include([version.ac])[] dnl define lcdf_typetools_version
AC_INIT([LCDF typetools (TeX Live)], lcdf_typetools_version, [tex-k at tug.org])
AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([lcdf-typetools-src/NEWS])
+AC_CONFIG_SRCDIR([lcdf-typetools-src/NEWS.md])
AC_CONFIG_AUX_DIR([../../build-aux])
AC_CONFIG_MACRO_DIRS([../../m4 m4])
@@ -39,6 +39,13 @@
AC_DEFINE([HAVE_PRECONDITION_CHECKING], [1], [Define to include precondition checking assertions.])
fi])
+AC_ARG_ENABLE([adobe-code],
+ [AS_HELP_STRING([--disable-adobe-code], [do not include Adobe code])],
+ [], [enable_adobe_code=yes])
+if test "$enable_adobe_code" = yes; then
+ AC_DEFINE([HAVE_ADOBE_CODE], [1], [Define to incldue Adobe code in output fonts.])
+fi
+
AC_CXX_TEMPLATE_OBJS
KPSE_CXX_HACK
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/ChangeLog
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/ChangeLog 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/ChangeLog 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,3 +1,10 @@
+2016-06-22 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import lcdf-typetools-2.106.
+ * patch-02-mingw64: Adapted.
+ * patch-20-TL-binary, patch-21-TL-paths, patch-30-W32TeX:
+ Unified as patch-03-w32.
+
2015-09-26 Peter Breitenlohner <peb at mppmu.mpg.de>
Import lcdf-typetools-2.105.
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/TL-Changes
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/TL-Changes 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/TL-Changes 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,5 +1,5 @@
Changes applied to the lcdf-typetools tree as obtained from:
- http://www.lcdf.org/type/lcdf-typetools-2.104.tar.gz
+ http://www.lcdf.org/type/lcdf-typetools-2.106.tar.gz
Removed:
aclocal.m4
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-02-mingw64
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-02-mingw64 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-02-mingw64 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,9 +1,6 @@
- MinGW64 complains when <winsock2.h> is included after <windows.h>
- (via include/efont/otfdata.hh).
-
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/include/config.h lcdf-typetools-2.105/include/config.h
---- lcdf-typetools-2.105.orig/include/config.h 2013-08-13 22:12:16.000000000 +0200
-+++ lcdf-typetools-2.105/include/config.h 2015-09-26 21:41:12.000000000 +0200
+diff -ur lcdf-typetools-2.106.orig/include/config.h lcdf-typetools-2.106/include/config.h
+--- lcdf-typetools-2.106.orig/include/config.h Wed Aug 14 05:12:16 2013
++++ lcdf-typetools-2.106/include/config.h Wed Jun 22 13:18:49 2016
@@ -6,6 +6,7 @@
/* Allow compilation on Windows (thanks, Fabrice Popineau). */
#ifdef WIN32
Added: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-03-w32
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-03-w32 (rev 0)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-03-w32 2016-06-22 06:25:09 UTC (rev 41518)
@@ -0,0 +1,218 @@
+diff -ur lcdf-typetools-2.106.orig/liblcdf/filename.cc lcdf-typetools-2.106/liblcdf/filename.cc
+--- lcdf-typetools-2.106.orig/liblcdf/filename.cc Wed Jun 22 06:01:56 2016
++++ lcdf-typetools-2.106/liblcdf/filename.cc Wed Jun 22 13:20:33 2016
+@@ -126,5 +126,5 @@
+ if (_actual || !_path)
+ return _actual;
+ else
+- return fopen(_path.c_str(), binary ? "wb" : "w");
++ return fopen(_path.c_str(), "wb");
+ }
+diff -ur lcdf-typetools-2.106.orig/otftotfm/automatic.cc lcdf-typetools-2.106/otftotfm/automatic.cc
+--- lcdf-typetools-2.106.orig/otftotfm/automatic.cc Wed Jun 22 06:00:36 2016
++++ lcdf-typetools-2.106/otftotfm/automatic.cc Wed Jun 22 13:43:40 2016
+@@ -39,6 +39,10 @@
+ #include <algorithm>
+
+ #ifdef WIN32
++#ifdef _MSC_VER
++# include <io.h>
++# include <direct.h>
++#endif
+ # define mkdir(dir, access) mkdir(dir)
+ # define COPY_CMD "copy"
+ # define CMD_SEP "&"
+@@ -124,7 +128,18 @@
+ static void
+ find_writable_texdir(ErrorHandler *errh, const char *)
+ {
++#if defined(W32TEX)
++// W32TeX does not have TEXMFVAR
++ char *p = kpsei_var_value("TEXMFVAR");
++ if (p == NULL) // W32TeX
++ look_for_writable_texdir("$TEXMFLOCAL", true);
++ else { // TeXLive
++ free (p);
++ look_for_writable_texdir("$TEXMFVAR", true);
++ }
++#else
+ look_for_writable_texdir("$TEXMFVAR", true);
++#endif
+ if (!writable_texdir)
+ look_for_writable_texdir("$VARTEXMF", false);
+ if (!writable_texdir)
+@@ -311,7 +326,7 @@
+ String ls_r = writable_texdir + "ls-R";
+ bool success = false;
+ if (access(ls_r.c_str(), R_OK) >= 0) // make sure it already exists
+- if (FILE *f = fopen(ls_r.c_str(), "a")) {
++ if (FILE *f = fopen(ls_r.c_str(), "ab")) {
+ fprintf(f, "./%s:\n%s\n", directory.c_str(), file.c_str());
+ success = true;
+ fclose(f);
+@@ -321,7 +336,11 @@
+ if (!success && writable_texdir.find_left('\'') < 0 && directory.find_left('\'') < 0 && file.find_left('\'') < 0) {
+ // look for mktexupd script
+ if (!mktexupd_tried) {
++#ifdef _WIN32
++ mktexupd = "mktexupd";
++#else
+ mktexupd = kpsei_string(kpsei_find_file("mktexupd", KPSEI_FMT_WEB2C));
++#endif
+ mktexupd_tried = true;
+ }
+
+@@ -675,7 +694,7 @@
+ #endif
+ {
+ fclose(f);
+- f = fopen(map_file.c_str(), "w");
++ f = fopen(map_file.c_str(), "wb");
+ fd = fileno(f);
+ }
+
+@@ -740,7 +759,16 @@
+ if (slash >= 0)
+ filename = filename.substring(slash + 1);
+ String redirect = verbose ? " 1>&2" : " >" DEV_NULL " 2>&1";
+- String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + redirect
++#if defined(W32TEX)
++// jtex_filetype is defined only in W32TeX
++ char *p = kpsei_var_value("jtex_filetype");
++ if (p != NULL) { // W32TeX
++ free(p);
++ String option = "--add ";
++ } else // TeXLive
++#endif
++ String option = "--enable Map ";
++ String command = "updmap --nomkmap " + option + shell_quote(filename) + redirect
+ + CMD_SEP " updmap" + redirect;
+ int retval = mysystem(command.c_str(), errh);
+ if (retval == 127)
+diff -ur lcdf-typetools-2.106.orig/otftotfm/kpseinterface.c lcdf-typetools-2.106/otftotfm/kpseinterface.c
+--- lcdf-typetools-2.106.orig/otftotfm/kpseinterface.c Wed Jun 22 06:00:26 2016
++++ lcdf-typetools-2.106/otftotfm/kpseinterface.c Wed Jun 22 13:45:39 2016
+@@ -21,6 +21,9 @@
+ #include <kpathsea/expand.h>
+ #include <kpathsea/c-pathch.h>
+ #include <kpathsea/tex-file.h>
++#ifdef W32TEX
++#include <kpathsea/variable.h>
++#endif
+ #include "kpseinterface.h"
+
+ int kpsei_env_sep_char = ENV_SEP;
+@@ -86,3 +89,11 @@
+ {
+ kpathsea_debug = flags;
+ }
++
++#ifdef W32TEX
++char*
++kpsei_var_value(const char *name)
++{
++ return kpse_var_value(name);
++}
++#endif
+diff -ur lcdf-typetools-2.106.orig/otftotfm/kpseinterface.h lcdf-typetools-2.106/otftotfm/kpseinterface.h
+--- lcdf-typetools-2.106.orig/otftotfm/kpseinterface.h Wed Aug 14 05:12:16 2013
++++ lcdf-typetools-2.106/otftotfm/kpseinterface.h Wed Jun 22 13:46:37 2016
+@@ -13,6 +13,10 @@
+ char* kpsei_find_file(const char* name, int format);
+ void kpsei_set_debug_flags(unsigned flags);
+
++#ifdef W32TEX
++char* kpsei_var_value(const char *name);
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff -ur lcdf-typetools-2.106.orig/otftotfm/otftotfm.cc lcdf-typetools-2.106/otftotfm/otftotfm.cc
+--- lcdf-typetools-2.106.orig/otftotfm/otftotfm.cc Wed Jun 22 06:06:05 2016
++++ lcdf-typetools-2.106/otftotfm/otftotfm.cc Wed Jun 22 13:47:38 2016
+@@ -63,6 +63,9 @@
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
++#ifdef _MSC_VER
++# include <io.h>
++#endif
+
+ using namespace Efont;
+
+@@ -582,7 +585,7 @@
+
+ if (verbose)
+ errh->message("creating %s", filename.c_str());
+- FILE *f = fopen(filename.c_str(), "w");
++ FILE *f = fopen(filename.c_str(), "wb");
+ if (!f) {
+ errh->error("%s: %s", filename.c_str(), strerror(errno));
+ return;
+@@ -1028,7 +1031,7 @@
+ #endif
+ {
+ fclose(f);
+- f = fopen(filename.c_str(), "w");
++ f = fopen(filename.c_str(), "wb");
+ fd = fileno(f);
+ }
+
+diff -ur lcdf-typetools-2.106.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.106/t1dotlessj/t1dotlessj.cc
+--- lcdf-typetools-2.106.orig/t1dotlessj/t1dotlessj.cc Wed Jun 22 06:06:02 2016
++++ lcdf-typetools-2.106/t1dotlessj/t1dotlessj.cc Wed Jun 22 13:27:55 2016
+@@ -410,10 +410,10 @@
+ // write it to output
+ if (!outputf)
+ outputf = stdout;
+- if (binary) {
+ #if defined(_MSDOS) || defined(_WIN32)
+- _setmode(_fileno(outputf), _O_BINARY);
++ _setmode(_fileno(outputf), _O_BINARY);
+ #endif
++ if (binary) {
+ Type1PFBWriter w(outputf);
+ dotless_font->write(w);
+ } else {
+diff -ur lcdf-typetools-2.106.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.106/t1rawafm/t1rawafm.cc
+--- lcdf-typetools-2.106.orig/t1rawafm/t1rawafm.cc Wed Jun 22 06:05:55 2016
++++ lcdf-typetools-2.106/t1rawafm/t1rawafm.cc Wed Jun 22 13:30:10 2016
+@@ -359,6 +359,9 @@
+ if (!outf)
+ errh->fatal("%s: %s", output_file, strerror(errno));
+ }
++#if defined(_MSDOS) || defined(_WIN32)
++ _setmode(_fileno(outf), _O_BINARY);
++#endif
+
+ write_afm(outf, font);
+
+diff -ur lcdf-typetools-2.106.orig/t1reencode/t1reencode.cc lcdf-typetools-2.106/t1reencode/t1reencode.cc
+--- lcdf-typetools-2.106.orig/t1reencode/t1reencode.cc Wed Jun 22 06:05:52 2016
++++ lcdf-typetools-2.106/t1reencode/t1reencode.cc Wed Jun 22 13:31:29 2016
+@@ -1094,10 +1094,10 @@
+ if (!outf)
+ errh->fatal("%s: %s", output_file, strerror(errno));
+ }
+- if (binary) {
+ #if defined(_MSDOS) || defined(_WIN32)
+- _setmode(_fileno(outf), _O_BINARY);
++ _setmode(_fileno(outf), _O_BINARY);
+ #endif
++ if (binary) {
+ Type1PFBWriter w(outf);
+ font->write(w);
+ } else {
+diff -ur lcdf-typetools-2.106.orig/t1testpage/t1testpage.cc lcdf-typetools-2.106/t1testpage/t1testpage.cc
+--- lcdf-typetools-2.106.orig/t1testpage/t1testpage.cc Wed Jun 22 06:05:45 2016
++++ lcdf-typetools-2.106/t1testpage/t1testpage.cc Wed Jun 22 13:32:21 2016
+@@ -665,6 +665,9 @@
+ if (!outf)
+ errh->fatal("%s: %s", output_file, strerror(errno));
+ }
++#if defined(_MSDOS) || defined(_WIN32)
++ _setmode(_fileno(outf), _O_BINARY);
++#endif
+
+ //font->undo_synthetic();
Deleted: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-20-TL-binary
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-20-TL-binary 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-20-TL-binary 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,112 +0,0 @@
- In TeX Live we treat all output files as binary.
-
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/liblcdf/filename.cc lcdf-typetools-2.105/liblcdf/filename.cc
---- lcdf-typetools-2.105.orig/liblcdf/filename.cc 2013-08-13 22:18:57.000000000 +0200
-+++ lcdf-typetools-2.105/liblcdf/filename.cc 2015-09-26 21:43:34.000000000 +0200
-@@ -126,5 +126,5 @@
- if (_actual || !_path)
- return _actual;
- else
-- return fopen(_path.c_str(), binary ? "wb" : "w");
-+ return fopen(_path.c_str(), "wb");
- }
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/otftotfm/automatic.cc lcdf-typetools-2.105/otftotfm/automatic.cc
---- lcdf-typetools-2.105.orig/otftotfm/automatic.cc 2014-01-09 17:24:47.000000000 +0100
-+++ lcdf-typetools-2.105/otftotfm/automatic.cc 2015-09-26 21:43:34.000000000 +0200
-@@ -311,7 +311,7 @@
- String ls_r = writable_texdir + "ls-R";
- bool success = false;
- if (access(ls_r.c_str(), R_OK) >= 0) // make sure it already exists
-- if (FILE *f = fopen(ls_r.c_str(), "a")) {
-+ if (FILE *f = fopen(ls_r.c_str(), "ab")) {
- fprintf(f, "./%s:\n%s\n", directory.c_str(), file.c_str());
- success = true;
- fclose(f);
-@@ -675,7 +675,7 @@
- #endif
- {
- fclose(f);
-- f = fopen(map_file.c_str(), "w");
-+ f = fopen(map_file.c_str(), "wb");
- fd = fileno(f);
- }
-
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/otftotfm/otftotfm.cc lcdf-typetools-2.105/otftotfm/otftotfm.cc
---- lcdf-typetools-2.105.orig/otftotfm/otftotfm.cc 2015-09-15 19:05:30.000000000 +0200
-+++ lcdf-typetools-2.105/otftotfm/otftotfm.cc 2015-09-26 21:43:34.000000000 +0200
-@@ -582,7 +582,7 @@
-
- if (verbose)
- errh->message("creating %s", filename.c_str());
-- FILE *f = fopen(filename.c_str(), "w");
-+ FILE *f = fopen(filename.c_str(), "wb");
- if (!f) {
- errh->error("%s: %s", filename.c_str(), strerror(errno));
- return;
-@@ -1024,7 +1024,7 @@
- #endif
- {
- fclose(f);
-- f = fopen(filename.c_str(), "w");
-+ f = fopen(filename.c_str(), "wb");
- fd = fileno(f);
- }
-
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.105/t1dotlessj/t1dotlessj.cc
---- lcdf-typetools-2.105.orig/t1dotlessj/t1dotlessj.cc 2014-05-23 22:17:05.000000000 +0200
-+++ lcdf-typetools-2.105/t1dotlessj/t1dotlessj.cc 2015-09-26 21:43:34.000000000 +0200
-@@ -410,10 +410,10 @@
- // write it to output
- if (!outputf)
- outputf = stdout;
-- if (binary) {
- #if defined(_MSDOS) || defined(_WIN32)
-- _setmode(_fileno(outputf), _O_BINARY);
-+ _setmode(_fileno(outputf), _O_BINARY);
- #endif
-+ if (binary) {
- Type1PFBWriter w(outputf);
- dotless_font->write(w);
- } else {
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.105/t1rawafm/t1rawafm.cc
---- lcdf-typetools-2.105.orig/t1rawafm/t1rawafm.cc 2015-09-15 20:03:32.000000000 +0200
-+++ lcdf-typetools-2.105/t1rawafm/t1rawafm.cc 2015-09-26 21:43:34.000000000 +0200
-@@ -359,6 +359,9 @@
- if (!outf)
- errh->fatal("%s: %s", output_file, strerror(errno));
- }
-+#if defined(_MSDOS) || defined(_WIN32)
-+ _setmode(_fileno(outf), _O_BINARY);
-+#endif
-
- write_afm(outf, font);
-
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/t1reencode/t1reencode.cc lcdf-typetools-2.105/t1reencode/t1reencode.cc
---- lcdf-typetools-2.105.orig/t1reencode/t1reencode.cc 2013-08-13 22:20:37.000000000 +0200
-+++ lcdf-typetools-2.105/t1reencode/t1reencode.cc 2015-09-26 21:43:34.000000000 +0200
-@@ -1094,10 +1094,10 @@
- if (!outf)
- errh->fatal("%s: %s", output_file, strerror(errno));
- }
-- if (binary) {
- #if defined(_MSDOS) || defined(_WIN32)
-- _setmode(_fileno(outf), _O_BINARY);
-+ _setmode(_fileno(outf), _O_BINARY);
- #endif
-+ if (binary) {
- Type1PFBWriter w(outf);
- font->write(w);
- } else {
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/t1testpage/t1testpage.cc lcdf-typetools-2.105/t1testpage/t1testpage.cc
---- lcdf-typetools-2.105.orig/t1testpage/t1testpage.cc 2013-08-13 22:20:45.000000000 +0200
-+++ lcdf-typetools-2.105/t1testpage/t1testpage.cc 2015-09-26 21:43:34.000000000 +0200
-@@ -665,6 +665,9 @@
- if (!outf)
- errh->fatal("%s: %s", output_file, strerror(errno));
- }
-+#if defined(_MSDOS) || defined(_WIN32)
-+ _setmode(_fileno(outf), _O_BINARY);
-+#endif
-
- //font->undo_synthetic();
-
Deleted: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-21-TL-paths
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-21-TL-paths 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-21-TL-paths 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,15 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/otftotfm/automatic.cc lcdf-typetools-2.105/otftotfm/automatic.cc
---- lcdf-typetools-2.105.orig/otftotfm/automatic.cc 2015-09-26 21:43:34.000000000 +0200
-+++ lcdf-typetools-2.105/otftotfm/automatic.cc 2015-09-26 21:49:48.000000000 +0200
-@@ -321,7 +321,11 @@
- if (!success && writable_texdir.find_left('\'') < 0 && directory.find_left('\'') < 0 && file.find_left('\'') < 0) {
- // look for mktexupd script
- if (!mktexupd_tried) {
-+#ifdef WIN32
-+ mktexupd = "mktexupd";
-+#else
- mktexupd = kpsei_string(kpsei_find_file("mktexupd", KPSEI_FMT_WEB2C));
-+#endif
- mktexupd_tried = true;
- }
-
Deleted: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-30-W32TeX
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-30-W32TeX 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-PATCHES/patch-30-W32TeX 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,103 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/otftotfm/automatic.cc lcdf-typetools-2.105/otftotfm/automatic.cc
---- lcdf-typetools-2.105.orig/otftotfm/automatic.cc 2015-09-26 21:49:48.000000000 +0200
-+++ lcdf-typetools-2.105/otftotfm/automatic.cc 2015-09-26 21:50:40.000000000 +0200
-@@ -39,6 +39,10 @@
- #include <algorithm>
-
- #ifdef WIN32
-+#ifdef _MSC_VER
-+# include <io.h>
-+# include <direct.h>
-+#endif
- # define mkdir(dir, access) mkdir(dir)
- # define COPY_CMD "copy"
- # define CMD_SEP "&"
-@@ -124,7 +128,18 @@
- static void
- find_writable_texdir(ErrorHandler *errh, const char *)
- {
-+#if defined(W32TEX)
-+// W32TeX does not have TEXMFVAR
-+ char *p = kpsei_var_value("TEXMFVAR");
-+ if (p == NULL) // W32TeX
-+ look_for_writable_texdir("$TEXMFLOCAL", true);
-+ else { // TeXLive
-+ free (p);
-+ look_for_writable_texdir("$TEXMFVAR", true);
-+ }
-+#else
- look_for_writable_texdir("$TEXMFVAR", true);
-+#endif
- if (!writable_texdir)
- look_for_writable_texdir("$VARTEXMF", false);
- if (!writable_texdir)
-@@ -744,7 +759,16 @@
- if (slash >= 0)
- filename = filename.substring(slash + 1);
- String redirect = verbose ? " 1>&2" : " >" DEV_NULL " 2>&1";
-- String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + redirect
-+#if defined(W32TEX)
-+// jtex_filetype is defined only in W32TeX
-+ char *p = kpsei_var_value("jtex_filetype");
-+ if (p != NULL) { // W32TeX
-+ free(p);
-+ String option = "--add ";
-+ } else // TeXLive
-+#endif
-+ String option = "--enable Map ";
-+ String command = "updmap --nomkmap " + option + shell_quote(filename) + redirect
- + CMD_SEP " updmap" + redirect;
- int retval = mysystem(command.c_str(), errh);
- if (retval == 127)
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/otftotfm/kpseinterface.c lcdf-typetools-2.105/otftotfm/kpseinterface.c
---- lcdf-typetools-2.105.orig/otftotfm/kpseinterface.c 2014-01-09 17:27:02.000000000 +0100
-+++ lcdf-typetools-2.105/otftotfm/kpseinterface.c 2015-09-26 21:50:40.000000000 +0200
-@@ -21,6 +21,9 @@
- #include <kpathsea/expand.h>
- #include <kpathsea/c-pathch.h>
- #include <kpathsea/tex-file.h>
-+#ifdef W32TEX
-+#include <kpathsea/variable.h>
-+#endif
- #include "kpseinterface.h"
-
- int kpsei_env_sep_char = ENV_SEP;
-@@ -86,3 +89,11 @@
- {
- kpathsea_debug = flags;
- }
-+
-+#ifdef W32TEX
-+char*
-+kpsei_var_value(const char *name)
-+{
-+ return kpse_var_value(name);
-+}
-+#endif
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/otftotfm/kpseinterface.h lcdf-typetools-2.105/otftotfm/kpseinterface.h
---- lcdf-typetools-2.105.orig/otftotfm/kpseinterface.h 2013-08-13 22:12:16.000000000 +0200
-+++ lcdf-typetools-2.105/otftotfm/kpseinterface.h 2015-09-26 21:50:40.000000000 +0200
-@@ -13,6 +13,10 @@
- char* kpsei_find_file(const char* name, int format);
- void kpsei_set_debug_flags(unsigned flags);
-
-+#ifdef W32TEX
-+char* kpsei_var_value(const char *name);
-+#endif
-+
- #ifdef __cplusplus
- }
- #endif
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.105.orig/otftotfm/otftotfm.cc lcdf-typetools-2.105/otftotfm/otftotfm.cc
---- lcdf-typetools-2.105.orig/otftotfm/otftotfm.cc 2015-09-26 21:43:34.000000000 +0200
-+++ lcdf-typetools-2.105/otftotfm/otftotfm.cc 2015-09-26 21:50:40.000000000 +0200
-@@ -63,6 +63,9 @@
- #ifdef HAVE_FCNTL_H
- # include <fcntl.h>
- #endif
-+#ifdef _MSC_VER
-+# include <io.h>
-+#endif
-
- using namespace Efont;
-
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.am
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.am 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.am 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = foreign check-news
+AUTOMAKE_OPTIONS = foreign
SUBDIRS = liblcdf libefont @SELECTED_SUBDIRS@
DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm \
@@ -6,7 +6,7 @@
t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
EXTRA_DIST = \
- ONEWS README.md \
+ ONEWS README.md NEWS.md \
lcdf-typetools.spec \
include/config.h \
include/lcdf/bezier.hh \
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,27 +86,18 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = lcdf-typetools-src
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/autoconf.h
+CONFIG_HEADER = autoconf.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_ at AM_V@)
@@ -172,8 +163,9 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)autoconf.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -192,8 +184,19 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in COPYING INSTALL NEWS
+CSCOPE = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/autoconf.h.in \
+ COPYING INSTALL compile depcomp install-sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -219,11 +222,16 @@
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -237,19 +245,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -259,27 +262,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -288,9 +279,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -297,16 +286,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -313,11 +298,7 @@
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@
@@ -326,11 +307,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -354,13 +331,13 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign check-news
+AUTOMAKE_OPTIONS = foreign
SUBDIRS = liblcdf libefont @SELECTED_SUBDIRS@
DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm \
t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
EXTRA_DIST = \
- ONEWS README.md \
+ ONEWS README.md NEWS.md \
lcdf-typetools.spec \
include/config.h \
include/lcdf/bezier.hh \
@@ -418,44 +395,58 @@
glyphlist_DATA = glyphlist.txt texglyphlist.txt
enc_DATA = 7t.enc
-all: all-recursive
+all: autoconf.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
+am--refresh: Makefile
+ @:
$(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 ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+ && exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/Makefile
+ $(AUTOMAKE) --foreign Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(SHELL) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-mostlyclean-libtool:
- -rm -f *.lo
+autoconf.h: stamp-h1
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-clean-libtool:
- -rm -rf .libs _libs
+stamp-h1: $(srcdir)/autoconf.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status autoconf.h
+$(srcdir)/autoconf.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f stamp-h1
+ touch $@
+
+distclean-hdr:
+ -rm -f autoconf.h stamp-h1
install-encDATA: $(enc_DATA)
@$(NORMAL_INSTALL)
@list='$(enc_DATA)'; test -n "$(encdir)" || list=; \
@@ -579,6 +570,12 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
cscopelist: cscopelist-recursive
cscopelist-am: $(am__tagged_files)
@@ -597,8 +594,11 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -656,9 +656,140 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__post_remove_distdir)
+
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__post_remove_distdir)
+
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+ $(am__post_remove_distdir)
+
+dist-xz: distdir
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(am__post_remove_distdir)
+
+dist-tarZ: distdir
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__post_remove_distdir)
+
+dist-shar: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__post_remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
+ $(am__post_remove_distdir)
+
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+ chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
+ $(am__post_remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile $(DATA)
+all-am: Makefile $(DATA) autoconf.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)"; do \
@@ -696,11 +827,12 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
dvi: dvi-recursive
@@ -743,12 +875,14 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf $(top_srcdir)/autom4te.cache
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic
pdf: pdf-recursive
@@ -760,21 +894,23 @@
uninstall-am: uninstall-encDATA uninstall-glyphlistDATA
-.MAKE: $(am__recursive_targets) install-am install-strip
+.MAKE: $(am__recursive_targets) all install-am install-strip
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
- check-am clean clean-generic clean-libtool cscopelist-am ctags \
- ctags-am dist-hook distclean distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-encDATA \
- install-exec install-exec-am install-glyphlistDATA \
- install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-encDATA install-exec install-exec-am \
+ install-glyphlistDATA install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-encDATA uninstall-glyphlistDATA
.PRECIOUS: Makefile
Deleted: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/NEWS
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/NEWS 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/NEWS 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,1218 +0,0 @@
-LCDF Typetools NEWS
-
-Version 2.105 15.Sep.2015
-
-* Several crash fixes.
-
-* otfinfo -g: Print all Unicode mappings for a glyph.
-
-* t1lint: Support counter control hints.
-
-* Thanks to Github issue contributors.
-
-
-Version 2.104 7.Jul.2014
-
-* Fix a nit with format-1 chaining context substitutions.
-
-
-Version 2.103 6.Jul.2014
-
-* otftotfm: Address a problem experienced by Bob Tennent where a
- ligature setting wasn't included in the output VPL.
-
-
-Version 2.102 4.Jul.2014
-
-* otftotfm: Fix the construction of multi-character secondary
- replacements; they were given enormous widths. Reported by Wydra
- Dennis.
-
-
-Version 2.101 16.Jun.2014
-
-* otftotfm: Handle fonts with unexpected transformation matrices,
- such as CFF fonts with 2048 units per em.
-
-* otftotfm: Add --x-height option.
-
-* otftotfm: Handle more TrueType fonts by fixing otftotfm bugs and
- compensating for some TTF bugs.
-
-* Thanks to Bob Tennent and Marc Penninga.
-
-
-Version 2.100 8.Jan.2014
-
-* otftotfm: On some fonts, ligature handling could enter an infinite
- loop. Fix this. Reported by Marc Penninga and Bob Tennent.
-
-* Fix updmap runs.
-
-* Build updates for C++11 and other compilers.
-
-
-Version 2.99 13.Aug.2013
-
-* cfftot1: Correct bug that rarely corrupted Type 1 output fonts.
- Reported by Sebastian Schubert.
-
-
-Version 2.98 10.Apr.2013
-
-* Fix alignment bug that corrupted output fonts on some platforms
- (MIPS especially). Reported by Norbert Preining.
-
-
-Version 2.97 25.Oct.2012
-
-* Same.
-
-
-Version 2.96 25.Oct.2012
-
-* Build improvements inspired by Peter Breitenlohner.
-
-
-Version 2.95 21.Sep.2012
-
-* Fix cfftot1: Don't crash on problematic fonts. Bob Tennent report.
-
-
-Version 2.94 3.Aug.2012
-
-* More compilation updates.
-
-
-Version 2.93 23.Jul.2012
-
-* Correct compilation problem reported by Dennis Veatch.
-
-* Update OpenType feature, script, and language lists, and some other nits.
-
-
-Version 2.92 14.Aug.2011
-
-* Correct horrible x86-64 byte-order issue. Bug reported by Michael Ummels.
-
-
-Version 2.91 13.Jun.2011
-
-* Correct some compilation problems on unusual systems reported by Vladimir
- Volovich.
-
-
-Version 2.90 3.Jun.2011
-
-* Correct crash on glyph names that start with a dot. Marc van Dongen
- report.
-
-
-Version 2.89 2.Jun.2011
-
-* Better handle combinations of fonts and options that would create so many
- substitutions that otftotfm would run out of memory. Marc van Dongen
- report.
-
-* Thanks to Peter Breitenlohner.
-
-
-Version 2.88 8.Mar.2011
-
-* Warning reduction.
-
-
-Version 2.87 27.Jan.2011
-
-* Avoid double-free error in t1testpage. Reported by Kurt Pfeifle.
-
-
-Version 2.86 16.Dec.2010
-
-* Support version 4 of the OpenType OS/2 table. Reported by Thomas
- Zumbrunn.
-
-
-Version 2.85 26.Sep.2010
-
-* Correct otftotfm bug with glyphlist.txt mappings like I_J.
-
-
-Version 2.84 15.Sep.2010
-
-* otftotfm: Avoid crashes on very large fonts and other odd situations.
- Bugs reported by Martin Schröder.
-
-* Include new Unicode mappings for glyph names from MSAM and MSBM.
-
-* Bug fixes to texglyphlist.txt Unicode mappings. Thanks to Clea F. Rees.
-
-
-Version 2.83 23.Apr.2010
-
-* otftotfm: If -fkern loads no GPOS lookups, apply the TTF kern table (if
- it exists). This should use the TTF kern table strictly more often than
- the previous version. Based on draft changes to the OpenType spec.
-
-* Update with changes from TeX Live. Thanks to Peter Breitenlohner.
-
-
-Version 2.82 19.Jan.2010
-
-* otftotfm: Correctly handle multiply-encoded glyphs (for example, if "j"
- ends up encoded in more than one slot, apply the j => j.smcp feature to
- both occurrences). Reported by Michael Ummels.
-
-
-Version 2.81 7.Jan.2010
-
-* otftotfm: Fix "em" and "ex" measurements (QUAD and XHEIGHT font
- dimensions) for TrueType fonts. Problem reported by Nico Schlömer.
-
-* otftotfm: Add --type42 option.
-
-
-Version 2.80 10.Nov.2009
-
-* otftotfm: Add --fixed-width, --proportional-width, and --italic-angle
- options. Requested by Karl Berry.
-
-
-Version 2.79 12.Jun.2009
-
-* otftotfm: Use TrueType "kern" tables to satisfy the "-fkern" feature if
- GPOS information isn't available. Requested by Nico Schlömer.
-
-* ttftotype42: Split very large non-glyf tables, as well as very large glyf
- tables. Requested by Mark DeVries.
-
-* otfinfo: The -T option dumps a table's contents to standard out.
-
-* Introduce and use a consistent hashcode_t type. Reported by Karl Berry.
-
-
-Version 2.78 6.Apr.2009
-
-* t1lint: Report warnings when a font charstring command has too many
- arguments. Requested by Han The Thanh.
-
-
-Version 2.77 6.Apr.2009
-
-* Font library changes: correctly implement binary search in a couple
- places -- unexpected sizes could lead to overflow and bad behavior.
- Reported by Mark DeVries for ttftotype42 and CharisSILR.
-
-
-Version 2.76 27.Mar.2009
-
-* mmpfb: Ensure all output subroutines end in the "return" command; some
- type 1 processors treat a subroutine ending in "endchar" as an error.
- Reported by Melissa O'Neill.
-
-* mmpfb, cfftot1: Ensure that stem3 hints (hstem3, vstem3) meet the
- necessary constraints, even despite rounding.
-
-* t1lint: Add checks for some more problems, such as subroutines that do
- not end in "return." Reported/requested by Melissa O'Neill and Han The
- Thanh.
-
-
-Version 2.75 22.Feb.2009
-
-* Report a helpful warning if automatic mode is specified to a version
- without kpathsea support. Question from Keith Briggs.
-
-
-Version 2.74 16.Feb.2009
-
-* Correctly detect <unistd.h>. Problem reported by C.M. Connelly.
-
-
-Version 2.73 15.Feb.2009
-
-* cfftot1 bug fix: Avoid introducing stray "rmoveto" commands and attendant
- visual artifacts into the output. The problem was caused by some
- coordinate system confusion. Reported by John Owens, who had tried to
- convert Inconsolata.
-
-
-Version 2.72 27.Oct.2008
-
-* t1rawafm: Add missing newlines; thanks, Michael Zedler.
-
-* otftotfm: Understand "UniXXXX" glyph names. They're not standard, but
- it's pretty obvious what they imply. Reported by Vasile Gaburici.
-
-
-Version 2.71 8.Aug.2008
-
-* otftotfm: Correctly install TrueType files when --force. Reported by
- Vasile Gaburici.
-
-
-Version 2.70 8.Aug.2008
-
-* Add new t1rawafm program, which generates a "raw" (kernless and
- ligatureless) AFM file given a font file (PFB/PFA).
-
-* otftotfm: When installing, --automatic ignores files existing in the
- current directory. Confusion reported by Vasile Gaburici.
-
-* Type 1 parsing: Parse fonts with rare encoding formats, such as bases
- other than 10.
-
-
-Version 2.69 5.May.2008
-
-* Mini portability fix for problem reported by Vladimir Volovich.
-
-
-Version 2.68 2.May.2008
-
-* otftotfm: Tweak the ligature sorting algorithm. Prefer lowercase
- ligatures to mixed-case and uppercase ligatures; prefer the conventional
- f-ligatures to all others. Reported by Ulrich Dirr.
-
-
-Version 2.67 25.Apr.2008
-
-* otftotfm: Improve font name construction for base fonts. Reported by
- Ulrich Dirr.
-
-
-Version 2.66 3.Aug.2007
-
-* otftotfm: TrueType fonts had inappropriately large kerning pairs; fixed.
- Reported by Marc Penninga.
-
-
-Version 2.65 22.Jul.2007
-
-* t1testpage: Fix bug triggered by fonts with empty encoding slots.
- Reported by Michael Zedler.
-
-
-Version 2.64 25.Jun.2007
-
-* Handle Extension format GPOS and GSUB lookup tables, used for very large
- fonts. Reported by Marc Penninga.
-
-* cfftot1, t1lint: Correct misunderstanding of the Flex spec: there MUST be
- an rmoveto in between any two Flex subroutines, even if that rmoveto
- doesn't move anywhere. (Question: Are hmoveto/vmoveto acceptable? Adobe
- Reader seems to think so.) Reported by John Owens with respect to
- Caslon-Antique.
-
-
-Version 2.63 12.Jun.2007
-
-* Correctly handle fonts with 4-byte character code cmap tables. Reported
- by Alexey Vikhlinin.
-
-
-Version 2.62 11.Apr.2007
-
-* t1dotlessj: Do not use the same UniqueID as the input font. Inspired by
- Reinhard Kotucha.
-
-* otftotfm: Generate a map line even if there was a missing character in
- some UNICODING. Reported by Andreas Bühmann.
-
-
-Version 2.61 25.Mar.2007
-
-* otftotfm: Automatically reduce DESIGNUNITS and try again if a font has
- humungocharacters that overflow PL files' limited range of allowed real
- numbers. Reported by John Owens.
-
-
-Version 2.60 27.Feb.2007
-
-* otftotfm: Rearrange order of virtual fonts so most-frequently-used font
- comes in position 0. Requested by Michael Zedler.
-
-* otftotfm: Apply letterspacing to "dotlessj". Maybe finally this is right.
-
-
-Version 2.59 23.Feb.2007
-
-* otftotfm: %POSITION commands don't add glyphs to the encoding. Requested
- by Achim Blumensath.
-
-
-Version 2.58 22.Feb.2007
-
-* otftotfm: More of the same (with respect to "Germandbls"), again reported
- by Michael Zedler.
-
-
-Version 2.57 21.Feb.2007
-
-* otftotfm: More of the same: "emptyslot" glyphs don't generate spurious
- base fonts. Again reported by Michael Zedler.
-
-
-Version 2.56 13.Feb.2007
-
-* otftotfm: Guess what?
-
-
-Version 2.55 13.Feb.2007
-
-* otftotfm: Finally fix (?) letterspacing for simulated characters.
-
-
-Version 2.54 12.Feb.2007
-
-* otftotfm: Include letterspacing for simulated characters. Bug reported
- by Michael Zedler.
-
-
-Version 2.53 11.Feb.2007
-
-* otftotfm: Positionings and letterspacing apply even with
- '--base-encodings'. Bug reported by Michael Zedler.
-
-
-Version 2.52 6.Feb.2007
-
-* otftotfm: '--base-encodings' fixes for dotless-J fonts.
-
-
-Version 2.51 6.Feb.2007
-
-* otftotfm: Some '--base-encodings' fixes.
-
-
-Version 2.50 6.Feb.2007
-
-* otftotfm: Add '--base-encodings' option. Requested by Michael Zedler.
-
-
-Version 2.49 11.Jan.2007
-
-* Report certain types of invalid 'size' features that occasionally occur
- in old fonts. Thanks to John Owens and Read Roberts.
-
-
-Version 2.48 11.Dec.2006
-
-* Translate font names into UTF-8 encoding. Reported by John Owens.
-
-
-Version 2.47 10.Dec.2006
-
-* otfinfo: Add new names, such as "Preferred Family", to 'otfinfo -i' output.
- Requested by John Owens.
-
-
-Version 2.46 29.Oct.2006
-
-* otftotfm: Base metrics files now reflect the actual base font metrics
- more accurately (rather than containing virtual-font-only metrics
- information, such as letterspacing). This should make it easier to tell,
- using "diff", whether two base metrics files contain the same data.
-
-* otftotfm: '--no-type1' does not affect dotless-j font generation; use
- '--no-dotlessj' for that (Michael Zedler).
-
-* otftotfm: Don't generate virtual fonts unless you have to (Michael
- Zedler).
-
-
-Version 2.45 17.Sep.2006
-
-* Include new ttftotype42 program.
-
-
-Version 2.44 16.Sep.2006
-
-* otfinfo/otftotfm: Support new fonts whose 'size' features are defined
- correctly. Thanks to Read Roberts for defining the compatibility check.
-
-
-Version 2.43 22.Aug.2006
-
-* otftotfm: Check for availability of kpse_opentype_format. Bug reported
- by Carsten Luckmann.
-
-
-Version 2.42 22.Aug.2006
-
-* otftotfm: Any --altselector-char is actually encoded, so you can use it
- as a regular character as well as an altselector. Suggested by Carsten
- Luckmann.
-
-
-Version 2.41 12.Aug.2006
-
-* otftotfm: Some TrueType fixes. Problems reported by Michael Zedler.
-
-
-Version 2.40 1.Aug.2006
-
-* otftotfm: Initial support for TrueType-flavored OpenType fonts. Inspired
- because John Owens is working with Microsoft's Calibri et al.
-
-
-Version 2.39 11.Jul.2006
-
-* cfftot1: Unify some subroutines previously missed, for slightly smaller
- output. Reported by Michael Zedler.
-
-
-Version 2.38 8.May.2006
-
-* otfinfo: Add '--info' option. Requested by John Owens.
-
-
-Version 2.37 25.Jan.2006
-
-* otftotfm: Add 'ringfitted'. Requested by Michael Zedler. Required bug
- fix.
-
-
-Version 2.36 9.Nov.2005
-
-* otfinfo: Add '-a/--family' option. Based on patch from Ottavio G. Rizzo.
-
-* otftotfm: Fix bug where '-q' would inhibit map line output, reported by
- Achim Blumensath.
-
-
-Version 2.35 3.Oct.2005
-
-* otftotfm: Allow '--ligkern "T h=:T_h"' (note lack of spaces around '=:').
- Inspired by Michael Saunders.
-
-* otftotfm: Split TeX extensions out from 'glyphlist.txt' into
- 'texglyphlist.txt', leaving 'glyphlist.txt' exactly as distributed by
- Adobe. Otftotfm reads both files. Requested by Werner Lemberg.
-
-* otftotfm: Add '% WARNMISSING' and '--warn-missing', so that missing
- characters result in blots and cause warnings when processed by dvips.
- Requested by Michael Zedler.
-
-* otfinfo: Add '-v/--font-version' option and document '-t/--tables' option.
-
-* t1reencode: Add many more standard encodings to t1reencode, and fix
- existing ones. Patch from Peter Betzler.
-
-
-Version 2.34 11.Jun.2005
-
-* otftotfm: Search for 'glyphlist.txt' using kpathsea, and set kpathsea
- program name to 'lcdftools'. Requested by Karl Berry.
-
-
-Version 2.33 3.Jun.2005
-
-* otftotfm: Include more secondary replacements, including double-bar,
- centered asterisk, per-ten-thousand, and so forth. Patch from Michael
- Zedler.
-
-* otftotfm: Add '% POSITION' and '--position'. Requested by Michael
- Zedler.
-
-
-Version 2.32 31.May.2005
-
-* otftotfm: Report correct dimensions for characters only in the base
- encoding. Reported by Michael Zedler.
-
-
-Version 2.31 30.May.2005
-
-* otftotfm: Fix crash tickled by constructed characters, reported by
- Michael Zedler.
-
-* Compilation fixes suggested by Nelson H.F. Beebe.
-
-
-Version 2.30 8.May.2005
-
-* otftotfm: Add support for 'dblbracketleft' and 'dblbracketright'.
- Secondary replacement can add characters to the font.
-
-* otftotfm: Ligkern commands 'A {5} B' and 'A {L} B' can coexist, leading
- to a 5-character kern and no ligature. Requested by Michael Zedler.
-
-
-Version 2.29 7.May.2005
-
-* otftotfm: Fix crash reported by Ryuji Suzuki.
-
-* otftotfm: Add support for 'capitalcompwordmark' and
- 'ascendercompwordmark', requested by Michael Zedler.
-
-* otftotfm: Use OpenType OS/2 table to determine x-height, if available.
-
-
-Version 2.28 25.Apr.2005
-
-* otftotfm: '--math-spacing' doesn't set italic corrections to 0. Thanks
- to Achim Blumensath.
-
-
-Version 2.27 24.Apr.2005
-
-* otftotfm: Add support for setting kerns: '--ligkern "A {5} B"'. Thanks
- to Achim Blumensath for a patch.
-
-* otftotfm: Add preliminary support for heuristically-derived math accent
- positions via a 'skewchar' argument to '--math-spacing'. Thanks again to
- Achim Blumensath.
-
-
-Version 2.26 2.Apr.2005
-
-* otftotfm: Support more kinds of substitution.
-
-* otftotfm: Support old-style and new-style chaining context substitutions
- using Adobe's procedure. Older fonts had erroneous substitutions because
- of a software error; newer fonts don't.
-
-* otftotfm: Fix crash tickled by newer versions of MinionPro and other
- fonts, reported by Michael Zedler and Oliver M. Haynold.
-
-
-Version 2.25 10.Mar.2005
-
-* otftotfm: Ignore unencoded default ligkerns (don't try to encode their
- characters). Reported by Michael Zedler.
-
-
-Version 2.24 10.Mar.2005
-
-* otftotfm: Fix assertion failure introduced in 2.23.
-
-
-Version 2.23 8.Mar.2005
-
-* otftotfm: Fix bug present since 2.20 where, for example, '--unicoding
- "germandbls =: SSsmall"' was ignored in favor of a named 'germandbls'
- character. Reported by Michael Zedler.
-
-
-Version 2.22 2.Mar.2005
-
-* otftotfm: Include default ligatures unless '--no-default-ligkern' is
- given. This seems cleaner than the previous semantics (which included
- the default ligatures unless there were ligatures in the encoding and/or
- the command line), but it is incompatible. Inspired by question from
- Christopher Swingely.
-
-
-Version 2.21 16.Feb.2005
-
-* otftotfm: Base fonts include no kerns or ligatures. Requested by Michael
- Zedler.
-
-* cfftot1: Correctly handle default values for CFF fonts, so that, for
- example, isFixedPitch is defined to false even when the font doesn't
- mention it. Requested by Huver.
-
-
-Version 2.20 9.Feb.2005
-
-* otftotfm: Add '--space-factor' and '--math-spacing' options, based on
- patches from Achim Blumensath.
-
-* otftotfm: Improve handling of explicit --ligkern ligatures: they override
- default ligatures, and any characters mentioned are shoehorned into the
- encoding. Catalyzed by Michael Zedler.
-
-
-Version 2.19 4.Feb.2005
-
-* otftotfm: Add '--subs-filter', '--include-subs', '--exclude-subs', and
- '--clear-subs' options (inspired by patch from Achim Blumensath).
-
-* otftotfm: Update documentation and behavior for newer teTeX
- installations. For instance, run the system 'updmap' by default (unless
- you give the '--no-updmap' option). This makes automatic mode much
- easier to set up.
-
-* otftotfm: Output pltotf and vptovf messages to standard error (Achim
- Blumensath).
-
-* otftotfm: Protect arguments given to the shell (Achim Blumensath).
-
-* otfinfo: Add '-g' option to query all glyphs in a font.
-
-
-Version 2.18 26.Jan.2005
-
-* otftotfm: Fix bug that could cause infinite loops on FreeBSD machines.
-
-
-Version 2.17 4.Jan.2005
-
-* Add t1reencode program. Requested by Ralph Aichinger.
-
-* otftotfm: Add '--output-encoding' option.
-
-* t1lint: Check that UniqueID and XUID values are in range.
-
-
-Version 2.16 19.Nov.2004
-
-* '--include-alternates' and '--exclude-alternates' options only apply to
- features that appear later in the options list.
-
-* Fix bug where not all '--altselector-feature' features would be used.
- Problem reported by Emil Lohse.
-
-* Add '--clear-alternates' option.
-
-
-Version 2.15 21.Sep.2004
-
-* AIX compile fixes. Reported by Vladimir Volovich.
-
-* Include RPM .spec file, provided by C.M. Connelly.
-
-
-Version 2.14 16.Sep.2004
-
-* Use AM_MAINTAINER_MODE. Suggested by Karl Berry.
-
-* IRIX compile fixes. Reported by Olaf Weber.
-
-
-Version 2.13 12.Sep.2004
-
-* otftotfm: Check $TEXMF if $VARTEXMF has no writable directory. Reported
- by Simon Patarin.
-
-* Add '--enable-selfauto-loc' configuration option, enabled by default, to
- help otftotfm run with TeX configuration files that use SELFAUTODIR and
- related variables. Suggested by Thomas Esser; mechanism from dvipng.
-
-
-Version 2.12 19.Aug.2004
-
-* Catch bug that would affect otftotfm on 64-bit machines.
-
-
-Version 2.11 18.Aug.2004
-
-* otftotfm: Adjust TDS 1.1 support thanks to Olaf Weber.
-
-
-Version 2.10 18.Aug.2004
-
-* otftotfm: Add preliminary support for the TeX Directory Structure 1.1
- standard.
-
-* Bug fix that should let us compile on Cygwin. Problem reported by
- Christian Gudrian.
-
-
-Version 2.9 10.Aug.2004
-
-* otftotfm: Add '--letter-feature' option, inspired by Michael Zedler.
-
-
-Version 2.8 5.Aug.2004
-
-* otftotfm: Fix bug where missing GPOS or GSUB tables would cause an abort.
- Reported by Ryuji Suzuki.
-
-
-Version 2.7 3.Aug.2004
-
-* otftotfm: Bug fix for obscure cases involving 'dotlessj' characters: the
- output VPL could contain a reference to "(SETCHAR X)", which is illegal.
- Reported by Marco Kuhlmann.
-
-
-Version 2.6 12.Jul.2004
-
-* t1testpage adds preliminary support for font smoke proofs with '--smoke'.
- Requested by Karl Berry.
-
-* t1testpage adds '--glyph' option.
-
-
-Version 2.5 6.Jul.2004
-
-* Support compilation with gcc-3.4.1. Reported by Thomas Esser.
-
-
-Version 2.4 30.Jun.2004
-
-* cfftot1: Fix off-by-one bug where the encoding of the last encoded
- character was ignored, reported by Detlev Droege.
-
-* otftotfm: Some internal changes; bugs are possible.
-
-
-Version 2.3 15.Jun.2004
-
-* otftotfm: Add '--default-ligkern' and '--no-encoding-commands' options,
- to address problem with "t1.enc" reported by Ulrich Dirr.
-
-* otftotfm documentation updates.
-
-
-Version 2.2 8.May.2004
-
-* otftotfm: 't1dotlessj' errors don't prevent 'psfonts.map' from being
- updated. Reported by Stephen Moye.
-
-* t1dotlessj: Report different kinds of errors with different exit statuses.
-
-
-Version 2.1 5.Apr.2004
-
-* otftotfm: Warn if no encoding specified. Requested by Zsolt Kiraly.
-
-* otftotfm: Improve documentation, particularly by adding example run with
- ".fd" file.
-
-
-Version 2.0 21.Mar.2004
-
-* mmpfb, t1dotlessj, t1lint, t1testpage: On Windows, add _O_BINARY flag
- when appropriate. Reported by Fabrice Popineau.
-
-
-Version 1.99 24.Feb.2004
-
-* otftotfm: Fix overfull encoding bug that could cause an assertion
- failure, reported by Adam Lindsay.
-
-* otftotfm: Speed improvement.
-
-
-Version 1.98 22.Feb.2004
-
-* otftotfm: Add support for 'SSsmall' glyph. Einar Smith noted that the
- OpenType 'smcp' feature doesn't translate the sharp-S character to
- small-caps "SS" in most fonts. Now, add '--unicoding "germandbls =:
- SSsmall"' to get that behavior.
-
-* otftotfm: Compilation fix for problem reported by Nelson H.F. Beebe.
-
-
-Version 1.97 6.Feb.2004
-
-* cfftot1: Fix bug in handling fonts with supplemental encodings. Problem
- reported by Eike <eiked>.
-
-
-Version 1.96 11.Jan.2004
-
-* otftotfm: Handle alternate characters like 'Q.alt' in the input encoding:
- map them to the actual alternate glyph, rather than to the base Unicode
- value ('Q'). Reported by Ulrich Dirr.
-
-
-Version 1.95 3.Jan.2004
-
-* otftotfm: Add automatic support for t1dotlessj. If the desired encoding
- has a 'dotlessj' character, and the input font doesn't, then otftotfm
- will run 't1dotlessj', create a dotless-J font, and include it using
- virtual fonts.
-
-* otftotfm: Avoid warnings about bad "(STOP)" commands in pltotf
- (introduced by the --min-kern facility).
-
-
-Version 1.91 31.Dec.2003
-
-* mmpfb, t1dotlessj: Fix sidebearing problems.
-
-
-Version 1.90 29.Dec.2003
-
-* mmpfb: Fix behavior with Adobe Jenson and other fonts with intermediate
- masters, and '--minimize' output, which had been broken since 1.65.
-
-* Add t1dotlessj program.
-
-
-Version 1.88 23.Dec.2003
-
-* otfinfo: Change coding to be friendlier to older C++ compilers. Requested
- by Ulrich Dirr.
-
-
-Version 1.87 22.Dec.2003
-
-* otftotfm: Fix --extend bug reported by Ulrich Dirr (the expansion factor
- was formerly applied to character heights and depths, not widths).
-
-
-Version 1.86 19.Dec.2003
-
-* otftotfm: Change where "--base" is added to support pdftex: If the font
- name is "WarnoPro+10", the base font name is "WarnoPro--base+10".
- Reported by Ulrich Dirr.
-
-
-Version 1.85 10.Dec.2003
-
-* otftotfm: Add --altselector-feature option, so you can specify the
- features activated by --altselector-char. Defaults to salt and dlig.
-
-* otftotfm: Fix intermittent hang.
-
-
-Version 1.80 4.Dec.2003
-
-* otftotfm: Add --altselector-char option, and --include-alternates and
- --exclude-alternates options. These options support access to alternate
- characters through ligatures, using a mechanism originally planned by
- Sivan Toledo ("Exploiting Rich Fonts", TUGboat 21(2), 2000). Requested
- by Martin Budaj.
-
-* Add default encoding for 'SS' character (same as 'Germandbls'). Reported
- by Ulrich Dirr.
-
-
-Version 1.75 3.Dec.2003
-
-* cfftot1: Handle the case when 'hintmask' is the first operator in a Type 2
- charstring. Reported by Tom Kacvinsky.
-
-
-Version 1.70 1.Dec.2003
-
-* otftotfm: Add --min-kern option requested by Ulrich Dirr.
-
-* mmafm: Add --min-kern as a preferred synonym for --kern-precision.
-
-
-Version 1.67 29.Nov.2003
-
-* otftotfm: Don't run off the end of an array. Bug reported and patch
- provided by Akira Kakuto.
-
-
-Version 1.66 24.Nov.2003
-
-* cfftot1: Don't generate "currentfile eexec" twice. Bug reported by Adam
- Lindsay.
-
-
-Version 1.65 24.Nov.2003
-
-* otftotfm: Include default ligatures if user does not specify ligatures.
- Requested by Adam Lindsay.
-
-* otftotfm: Generated VPL includes FONTDSIZE when referring to base. Bug
- reported by Adam Lindsay.
-
-* Preliminary support for CID-keyed OpenType fonts.
-
-
-Version 1.60 7.Oct.2003
-
-* cfftot1: Support fonts using the 'seac' operator. Requested by Ralf
- Koenig.
-
-
-Version 1.52 4.Sep.2003
-
-* otftotfm: Add --design-size option requested by Johannes Kuester.
-
-* t1testpage: Fix --help and add manual page at C.M. Connelly's request.
-
-
-Version 1.51 2.Sep.2003
-
-* otftotfm: Generated TFM and PL files have DESIGNSIZE set to the font's
- actual design size, as read from the 'size' feature. Requested by
- Johannes Kuester.
-
-
-Version 1.50 26.Aug.2003
-
-* Minor compilation fix; problem reported by Nelson H.F. Beebe.
-
-
-Version 1.50b4 26.Aug.2003
-
-* otfinfo: Minor compilation fix from Tom Kacvinsky.
-
-
-Version 1.50b3 25.Aug.2003
-
-* cfftot1: Emit UniqueID as an integer. Reported by Tom Kacvinsky.
-
-* otftotfm: '--without-kpathsea' fix. Patch provided by Adam Lindsay.
-
-* More compilation fixes provided by Tom Kacvinsky.
-
-
-Version 1.50b2 24.Aug.2003
-
-* otfinfo: New program, requested by Adam Lindsay.
-
-* otftotfm: The '--query-scripts' and '--query-features' options are no
- longer supported. Use 'otfinfo -s' and 'otfinfo -f' instead.
-
-* otftotfm: Fix crash reported by Adam Lindsay.
-
-* otftotfm: In automatic mode, after modifying a 'psfonts.map' file, run
- the script 'TEXMF/dvips/updmap' if present.
-
-* Compilation fixes for Solaris provided by Tom Kacvinsky and Nelson
- H.F. Beebe.
-
-
-Version 1.50b1 20.Aug.2003
-
-* Integrate mminstance (the mmafm and mmpfb programs), and bump the version
- number to reflect this.
-
-
-Version 0.53 10.Aug.2003
-
-* Fix problem with Type 1 output in '--without-kpathsea' reported by Adam
- Lindsay.
-
-* Fix crash on encodings containing 'emptyslot' reported by Marco Kuhlmann.
-
-
-Version 0.52 7.Aug.2003
-
-* Attempt to fix some build problems reported by Nelson H.F. Beebe.
-
-
-Version 0.51 5.Aug.2003
-
-* otftotfm: Fix crashes with small encodings and absent boundary
- characters. Reported by Bruce D'Arcus.
-
-* otftotfm: Add '--boundary-char' and '--kpathsea-debug' options.
-
-
-Version 0.50 4.Aug.2003
-
-* otftotfm: Handle more complex substitutions, such as those required to
- support '-fordn' and '-ffrac'.
-
-* otftotfm: The output virtual and base fonts can have different
- "encodings" with overlapping encoding slots. This can make fonts more
- compact.
-
-* When assigning slots to introduced characters, otftotfm prefers
- characters introduced by earlier lookups. This follows the spirit of the
- OpenType specification, since early lookups in some ways "override" later
- ones. The previous scoring mechanism remains in force within each
- individual lookup.
-
-* otftotfm: Rewrite GsubEncoding to Metrics, changing its fundamental
- abstraction (to two-ligatures). Simpler and cleaner overall.
-
-* otftotfm TODO: Ligatures that apply to middle or right context (for
- example, the two substitutions "a b c d => a b c y" and "b c => x" should
- combine to "a b c d => a x y", but they won't yet).
-
-
-Version 0.19 30.Jul.2003
-
-* otftotfm: Add support for 'emptyslot' UNICODINGs. Requested by Marco
- Kuhlmann.
-
-
-Version 0.18 9.Jul.2003
-
-* Otftotfm will now synthesize characters for some T1 glyphs automatically,
- specifically 'cwm' (compound word mark), 'visualspace', and 'Germandbls'.
- Requested by Marco Kuhlmann.
-
-* The glyphlist.txt file contains Unicode mappings for character names
- found in the BlueSky Computer Modern math italic and symbol fonts.
-
-* It also contains fake Unicode mappings for the 'cwm', 'visualspace', and
- 'Germandbls' characters found in EC.enc.
-
-* otftotfm: Don't output a KRN between two characters if there exists a LIG
- for those two characters.
-
-
-Version 0.17 6.Jul.2003
-
-* otftotfm: Ligatures removed with LIGKERN commands won't show up in the
- encoding.
-
-* Improve scoring heuristics by which otftotfm decides which characters are
- more important (for when there isn't enough encoding space for all new
- glyphs).
-
-
-Version 0.16 6.Jul.2003
-
-* otftotfm: In automatic mode, store dvips files (encodings and
- psfonts.map) in 'TEXMF/dvips/VENDOR', rather than 'TEXMF/dvips'. Users of
- previous versions will probably want to move their 'TEXMF/dvips/a_*.enc'
- and 'TEXMF/dvips/lcdftools.map' files to a 'TEXMF/dvips/lcdftools/'
- directory, and run 'mktexlsr TEXMF'.
-
-* otftotfm: When there isn't enough encoding space for all new glyphs,
- prefer shorter ligatures made out of regular letters -- for instance,
- prefer f_j to f_f_j, and T_h to f_iacute. Requested by Bruce D'Arcus.
-
-* otftotfm: Add '--ligkern' and '--unicoding' options.
-
-* otftotfm: Add '--coding-scheme' option and '% CODINGSCHEME' encoding
- comment, to define the PL/TFM coding scheme for the font. Apparently
- fontinst actually looks at the coding scheme. Also, when you specify a
- coding scheme, set DESIGNUNITS to 1, again to satisfy fontinst. Requested
- by Marco Kuhlmann.
-
-* otftotfm: Remove virtual font 'N.vf' when installing a regular font
- 'N.tfm' in automatic mode. This reduces the risk that an old virtual font
- will screw up your installation.
-
-
-Version 0.15 4.Jul.2003
-
-* otftotfm: Bug fix: Don't multiply apply substitutions and kerns from the
- same lookup.
-
-* otftotfm: Supports simple left-contextual substitutions, necessary for
- ExPontoPro's 'calt' (Contextual Alternates) feature.
-
-
-Version 0.14 2.Jul.2003
-
-* otftotfm: Add '-L/--letterspacing' option at Bruce D'Arcus's request.
-
-* otftotfm: Hypothetically supports the contextual substitutions necessary
- for the 'init' (Initial Forms) feature.
-
-* otftotfm: When you make a virtual font named "foo", remove any entries
- for "foo" from VENDOR.map.
-
-
-Version 0.13 27.Jun.2003
-
-* --without-kpathsea works. Problem reported by Adam Lindsay.
-
-
-Version 0.12 27.Jun.2003
-
-* otftotfm: Better error messages when directories cannot be found.
- Reported by Bruce D'Arcus.
-
-
-Version 0.11 26.Jun.2003
-
-* otftotfm: Handles the contextual substitutions necessary for 'cswh'
- (Contextual Swash) and 'fina' (Terminal Forms) features.
-
-
-Version 0.10 26.Jun.2003
-
-* otftotfm: Update ls-R files for new encodings.
-
-
-Version 0.9 25.Jun.2003
-
-* otftotfm: psfonts.map lines contain the file name only (no directories).
- Requested by Norbert Preining.
-
-* otftotfm: Properly report errors when encoding files can't be found.
-
-* Fix kpathsea searching and dependency problems reported by Bruce D'Arcus
- and Claire Connelly, among others.
-
-* Fix templates to allow compilation with GCC 2.95.
-
-
-Version 0.8 23.Jun.2003
-
-* otftopl has been renamed to otftotfm. The new program takes different
- options. Automatic mode is particularly different, and TFM output is now
- the default.
-
-* otftotfm: Automatic mode now sticks files into a TeX Directory Structure
- hierarchy. This works well with many TeX installations. It also
- automatically translates OpenType fonts into Type 1 PostScript with
- cfftot1 (unless you configure with --disable-cfftot1), and modifies a
- psfonts.map file for each font. See the manual page for more information.
-
-* otftotfm: Generates virtual fonts when required to support glyph
- positioning features. ("-f cpsp" is one example.)
-
-* otftotfm: Warns when a feature could not be completely implemented.
-
-* otftotfm: Add --verbose and --no-create options, among others
- (--no-virtual, --map-file, --vendor, --typeface, --no-type1...).
-
-* otftotfm: Encoding files are now named "a_SIGNATURE.enc", not
- "auto_SIGNATURE.enc".
-
-* The configure script now searches for the kpathsea library, since
- otftotfm's automatic mode depends on kpathsea. Provide
- '--without-kpathsea' to disable it.
-
-
-Version 0.7 13.Jun.2003
-
-* cfftot1: Fix bug to handle MinionPro-Italic without crashing.
-
-
-Version 0.6 12.Jun.2003
-
-* cfftot1: Fix definitions of Subrs entries 1 and 2; now fonts with flex
- hints will work.
-
-* cfftot1: Reduce noise generated by fonts with flex hints.
-
-* cfftot1: Generates valid character strings for characters whose first
- point is at the origin. (Previously, such charstrings wouldn't begin with
- a "moveto".)
-
-* otftopl: Support simple context substitutions and chained context
- substitutions. Required to support ACaslonPro-Italic's "swsh" feature.
- Reported by Adam Lindsay <atl at comp.lancs.ac.uk>.
-
-* otftopl: Prefer '--query-features' and '--query-scripts' to
- '--print-features' and '--print-scripts'.
-
-* otftopl: Better warnings and error messages for bad LIGKERN/UNICODING
- commands in encoding files, and when there isn't enough room in an
- encoding for ligature glyphs.
-
-* t1lint: Reads stdin if no filenames supplied on the command line.
-
-
-Version 0.5 5.Jun.2003
-
-* Template reorganization so the typetools compile with GCC 3.3.
-
-
-Version 0.4 3.Jun.2003
-
-* otftopl: Added --slant and --extend options.
-
-* otftopl's generated encodings have slightly different form, and are thus
- friendlier to ps2pk's bad parser.
-
-
-Version 0.3 3.Jun.2003
-
-* Fixed bug: cfftot1 produced invalid results for fonts with encodings
- other than StandardEncoding, due to a misbehavior in the way Type 1 fonts
- were stored. Reported by Vladimir Volovich <vvv at vsu.ru>.
-
-
-Version 0.2 3.Jun.2003
-
-* Fix CFF parsing bugs and configure errors reported by Vladimir Volovich
- <vvv at vsu.ru>.
-
-
-Version 0.1 2.Jun.2003
-
-* Initial release.
-
-
-See also the ONEWS file for older news about mmafm and mmpfb.
Added: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/NEWS.md
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/NEWS.md (rev 0)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/NEWS.md 2016-06-22 06:25:09 UTC (rev 41518)
@@ -0,0 +1,1223 @@
+LCDF Typetools NEWS
+===================
+
+## Version 2.106 – 21.Jun.2016
+
+* Minor updates, mostly involving licensing of Adobe code and data.
+
+
+## Version 2.105 – 15.Sep.2015
+
+* Several crash fixes.
+
+* `otfinfo -g`: Print all Unicode mappings for a glyph.
+
+* t1lint: Support counter control hints.
+
+* Thanks to Github issue contributors.
+
+
+## Version 2.104 – 7.Jul.2014
+
+* Fix a nit with format-1 chaining context substitutions.
+
+
+## Version 2.103 – 6.Jul.2014
+
+* otftotfm: Address a problem experienced by Bob Tennent where a
+ ligature setting wasn't included in the output VPL.
+
+
+## Version 2.102 – 4.Jul.2014
+
+* otftotfm: Fix the construction of multi-character secondary
+ replacements; they were given enormous widths. Reported by Wydra
+ Dennis.
+
+
+## Version 2.101 – 16.Jun.2014
+
+* otftotfm: Handle fonts with unexpected transformation matrices,
+ such as CFF fonts with 2048 units per em.
+
+* otftotfm: Add `--x-height` option.
+
+* otftotfm: Handle more TrueType fonts by fixing otftotfm bugs and
+ compensating for some TTF bugs.
+
+* Thanks to Bob Tennent and Marc Penninga.
+
+
+## Version 2.100 – 8.Jan.2014
+
+* otftotfm: On some fonts, ligature handling could enter an infinite
+ loop. Fix this. Reported by Marc Penninga and Bob Tennent.
+
+* Fix updmap runs.
+
+* Build updates for C++11 and other compilers.
+
+
+## Version 2.99 – 13.Aug.2013
+
+* cfftot1: Correct bug that rarely corrupted Type 1 output fonts.
+ Reported by Sebastian Schubert.
+
+
+## Version 2.98 – 10.Apr.2013
+
+* Fix alignment bug that corrupted output fonts on some platforms
+ (MIPS especially). Reported by Norbert Preining.
+
+
+## Version 2.97 – 25.Oct.2012
+
+* Same.
+
+
+## Version 2.96 – 25.Oct.2012
+
+* Build improvements inspired by Peter Breitenlohner.
+
+
+## Version 2.95 – 21.Sep.2012
+
+* Fix cfftot1: Don't crash on problematic fonts. Bob Tennent report.
+
+
+## Version 2.94 – 3.Aug.2012
+
+* More compilation updates.
+
+
+## Version 2.93 – 23.Jul.2012
+
+* Correct compilation problem reported by Dennis Veatch.
+
+* Update OpenType feature, script, and language lists, and some other nits.
+
+
+## Version 2.92 – 14.Aug.2011
+
+* Correct horrible x86-64 byte-order issue. Bug reported by Michael Ummels.
+
+
+## Version 2.91 – 13.Jun.2011
+
+* Correct some compilation problems on unusual systems reported by Vladimir
+ Volovich.
+
+
+## Version 2.90 – 3.Jun.2011
+
+* Correct crash on glyph names that start with a dot. Marc van Dongen
+ report.
+
+
+## Version 2.89 – 2.Jun.2011
+
+* Better handle combinations of fonts and options that would create so many
+ substitutions that otftotfm would run out of memory. Marc van Dongen
+ report.
+
+* Thanks to Peter Breitenlohner.
+
+
+## Version 2.88 – 8.Mar.2011
+
+* Warning reduction.
+
+
+## Version 2.87 – 27.Jan.2011
+
+* Avoid double-free error in t1testpage. Reported by Kurt Pfeifle.
+
+
+## Version 2.86 – 16.Dec.2010
+
+* Support version 4 of the OpenType OS/2 table. Reported by Thomas
+ Zumbrunn.
+
+
+## Version 2.85 – 26.Sep.2010
+
+* Correct otftotfm bug with glyphlist.txt mappings like I_J.
+
+
+## Version 2.84 – 15.Sep.2010
+
+* otftotfm: Avoid crashes on very large fonts and other odd situations.
+ Bugs reported by Martin Schröder.
+
+* Include new Unicode mappings for glyph names from MSAM and MSBM.
+
+* Bug fixes to texglyphlist.txt Unicode mappings. Thanks to Clea F. Rees.
+
+
+## Version 2.83 – 23.Apr.2010
+
+* otftotfm: If `-fkern` loads no GPOS lookups, apply the TTF kern table (if
+ it exists). This should use the TTF kern table strictly more often than
+ the previous version. Based on draft changes to the OpenType spec.
+
+* Update with changes from TeX Live. Thanks to Peter Breitenlohner.
+
+
+## Version 2.82 – 19.Jan.2010
+
+* otftotfm: Correctly handle multiply-encoded glyphs (for example, if "j"
+ ends up encoded in more than one slot, apply the j => j.smcp feature to
+ both occurrences). Reported by Michael Ummels.
+
+
+## Version 2.81 – 7.Jan.2010
+
+* otftotfm: Fix "em" and "ex" measurements (QUAD and XHEIGHT font
+ dimensions) for TrueType fonts. Problem reported by Nico Schlömer.
+
+* otftotfm: Add `--type42` option.
+
+
+## Version 2.80 – 10.Nov.2009
+
+* otftotfm: Add `--fixed-width`, `--proportional-width`, and `--italic-angle`
+ options. Requested by Karl Berry.
+
+
+## Version 2.79 – 12.Jun.2009
+
+* otftotfm: Use TrueType "kern" tables to satisfy the `-fkern` feature if
+ GPOS information isn't available. Requested by Nico Schlömer.
+
+* ttftotype42: Split very large non-glyf tables, as well as very large glyf
+ tables. Requested by Mark DeVries.
+
+* otfinfo: The `-T` option dumps a table's contents to standard out.
+
+* Introduce and use a consistent hashcode_t type. Reported by Karl Berry.
+
+
+## Version 2.78 – 6.Apr.2009
+
+* t1lint: Report warnings when a font charstring command has too many
+ arguments. Requested by Han The Thanh.
+
+
+## Version 2.77 – 6.Apr.2009
+
+* Font library changes: correctly implement binary search in a couple
+ places -- unexpected sizes could lead to overflow and bad behavior.
+ Reported by Mark DeVries for ttftotype42 and CharisSILR.
+
+
+## Version 2.76 – 27.Mar.2009
+
+* mmpfb: Ensure all output subroutines end in the "return" command; some
+ type 1 processors treat a subroutine ending in "endchar" as an error.
+ Reported by Melissa O'Neill.
+
+* mmpfb, cfftot1: Ensure that stem3 hints (hstem3, vstem3) meet the
+ necessary constraints, even despite rounding.
+
+* t1lint: Add checks for some more problems, such as subroutines that do
+ not end in "return." Reported/requested by Melissa O'Neill and Han The
+ Thanh.
+
+
+## Version 2.75 – 22.Feb.2009
+
+* Report a helpful warning if automatic mode is specified to a version
+ without kpathsea support. Question from Keith Briggs.
+
+
+## Version 2.74 – 16.Feb.2009
+
+* Correctly detect <unistd.h>. Problem reported by C.M. Connelly.
+
+
+## Version 2.73 – 15.Feb.2009
+
+* cfftot1 bug fix: Avoid introducing stray "rmoveto" commands and attendant
+ visual artifacts into the output. The problem was caused by some
+ coordinate system confusion. Reported by John Owens, who had tried to
+ convert Inconsolata.
+
+
+## Version 2.72 – 27.Oct.2008
+
+* t1rawafm: Add missing newlines; thanks, Michael Zedler.
+
+* otftotfm: Understand "UniXXXX" glyph names. They're not standard, but
+ it's pretty obvious what they imply. Reported by Vasile Gaburici.
+
+
+## Version 2.71 – 8.Aug.2008
+
+* otftotfm: Correctly install TrueType files when `--force`. Reported by
+ Vasile Gaburici.
+
+
+## Version 2.70 – 8.Aug.2008
+
+* Add new t1rawafm program, which generates a "raw" (kernless and
+ ligatureless) AFM file given a font file (PFB/PFA).
+
+* otftotfm: When installing, `--automatic` ignores files existing in the
+ current directory. Confusion reported by Vasile Gaburici.
+
+* Type 1 parsing: Parse fonts with rare encoding formats, such as bases
+ other than 10.
+
+
+## Version 2.69 – 5.May.2008
+
+* Mini portability fix for problem reported by Vladimir Volovich.
+
+
+## Version 2.68 – 2.May.2008
+
+* otftotfm: Tweak the ligature sorting algorithm. Prefer lowercase
+ ligatures to mixed-case and uppercase ligatures; prefer the conventional
+ f-ligatures to all others. Reported by Ulrich Dirr.
+
+
+## Version 2.67 – 25.Apr.2008
+
+* otftotfm: Improve font name construction for base fonts. Reported by
+ Ulrich Dirr.
+
+
+## Version 2.66 – 3.Aug.2007
+
+* otftotfm: TrueType fonts had inappropriately large kerning pairs; fixed.
+ Reported by Marc Penninga.
+
+
+## Version 2.65 – 22.Jul.2007
+
+* t1testpage: Fix bug triggered by fonts with empty encoding slots.
+ Reported by Michael Zedler.
+
+
+## Version 2.64 – 25.Jun.2007
+
+* Handle Extension format GPOS and GSUB lookup tables, used for very large
+ fonts. Reported by Marc Penninga.
+
+* cfftot1, t1lint: Correct misunderstanding of the Flex spec: there MUST be
+ an rmoveto in between any two Flex subroutines, even if that rmoveto
+ doesn't move anywhere. (Question: Are hmoveto/vmoveto acceptable? Adobe
+ Reader seems to think so.) Reported by John Owens with respect to
+ Caslon-Antique.
+
+
+## Version 2.63 – 12.Jun.2007
+
+* Correctly handle fonts with 4-byte character code cmap tables. Reported
+ by Alexey Vikhlinin.
+
+
+## Version 2.62 – 11.Apr.2007
+
+* t1dotlessj: Do not use the same UniqueID as the input font. Inspired by
+ Reinhard Kotucha.
+
+* otftotfm: Generate a map line even if there was a missing character in
+ some UNICODING. Reported by Andreas Bühmann.
+
+
+## Version 2.61 – 25.Mar.2007
+
+* otftotfm: Automatically reduce DESIGNUNITS and try again if a font has
+ humungocharacters that overflow PL files' limited range of allowed real
+ numbers. Reported by John Owens.
+
+
+## Version 2.60 – 27.Feb.2007
+
+* otftotfm: Rearrange order of virtual fonts so most-frequently-used font
+ comes in position 0. Requested by Michael Zedler.
+
+* otftotfm: Apply letterspacing to "dotlessj". Maybe finally this is right.
+
+
+## Version 2.59 – 23.Feb.2007
+
+* otftotfm: %POSITION commands don't add glyphs to the encoding. Requested
+ by Achim Blumensath.
+
+
+## Version 2.58 – 22.Feb.2007
+
+* otftotfm: More of the same (with respect to "Germandbls"), again reported
+ by Michael Zedler.
+
+
+## Version 2.57 – 21.Feb.2007
+
+* otftotfm: More of the same: "emptyslot" glyphs don't generate spurious
+ base fonts. Again reported by Michael Zedler.
+
+
+## Version 2.56 – 13.Feb.2007
+
+* otftotfm: Guess what?
+
+
+## Version 2.55 – 13.Feb.2007
+
+* otftotfm: Finally fix (?) letterspacing for simulated characters.
+
+
+## Version 2.54 – 12.Feb.2007
+
+* otftotfm: Include letterspacing for simulated characters. Bug reported
+ by Michael Zedler.
+
+
+## Version 2.53 – 11.Feb.2007
+
+* otftotfm: Positionings and letterspacing apply even with
+ `--base-encodings`. Bug reported by Michael Zedler.
+
+
+## Version 2.52 – 6.Feb.2007
+
+* otftotfm: `--base-encodings` fixes for dotless-J fonts.
+
+
+## Version 2.51 – 6.Feb.2007
+
+* otftotfm: Some `--base-encodings` fixes.
+
+
+## Version 2.50 – 6.Feb.2007
+
+* otftotfm: Add `--base-encodings` option. Requested by Michael Zedler.
+
+
+## Version 2.49 – 11.Jan.2007
+
+* Report certain types of invalid 'size' features that occasionally occur
+ in old fonts. Thanks to John Owens and Read Roberts.
+
+
+## Version 2.48 – 11.Dec.2006
+
+* Translate font names into UTF-8 encoding. Reported by John Owens.
+
+
+## Version 2.47 – 10.Dec.2006
+
+* otfinfo: Add new names, such as "Preferred Family", to `otfinfo -i` output.
+ Requested by John Owens.
+
+
+## Version 2.46 – 29.Oct.2006
+
+* otftotfm: Base metrics files now reflect the actual base font metrics
+ more accurately (rather than containing virtual-font-only metrics
+ information, such as letterspacing). This should make it easier to tell,
+ using "diff", whether two base metrics files contain the same data.
+
+* otftotfm: `--no-type1` does not affect dotless-j font generation; use
+ `--no-dotlessj` for that (Michael Zedler).
+
+* otftotfm: Don't generate virtual fonts unless you have to (Michael
+ Zedler).
+
+
+## Version 2.45 – 17.Sep.2006
+
+* Include new ttftotype42 program.
+
+
+## Version 2.44 – 16.Sep.2006
+
+* otfinfo/otftotfm: Support new fonts whose 'size' features are defined
+ correctly. Thanks to Read Roberts for defining the compatibility check.
+
+
+## Version 2.43 – 22.Aug.2006
+
+* otftotfm: Check for availability of kpse_opentype_format. Bug reported
+ by Carsten Luckmann.
+
+
+## Version 2.42 – 22.Aug.2006
+
+* otftotfm: Any `--altselector-char` is actually encoded, so you can use it as
+ a regular character as well as an altselector. Suggested by Carsten
+ Luckmann.
+
+
+## Version 2.41 – 12.Aug.2006
+
+* otftotfm: Some TrueType fixes. Problems reported by Michael Zedler.
+
+
+## Version 2.40 – 1.Aug.2006
+
+* otftotfm: Initial support for TrueType-flavored OpenType fonts. Inspired
+ because John Owens is working with Microsoft's Calibri et al.
+
+
+## Version 2.39 – 11.Jul.2006
+
+* cfftot1: Unify some subroutines previously missed, for slightly smaller
+ output. Reported by Michael Zedler.
+
+
+## Version 2.38 – 8.May.2006
+
+* otfinfo: Add `--info` option. Requested by John Owens.
+
+
+## Version 2.37 – 25.Jan.2006
+
+* otftotfm: Add 'ringfitted'. Requested by Michael Zedler. Required bug
+ fix.
+
+
+## Version 2.36 – 9.Nov.2005
+
+* otfinfo: Add `-a/--family` option. Based on patch from Ottavio G. Rizzo.
+
+* otftotfm: Fix bug where `-q` would inhibit map line output, reported by
+ Achim Blumensath.
+
+
+## Version 2.35 – 3.Oct.2005
+
+* otftotfm: Allow `--ligkern "T h=:T_h"` (note lack of spaces around '=:').
+ Inspired by Michael Saunders.
+
+* otftotfm: Split TeX extensions out from 'glyphlist.txt' into
+ 'texglyphlist.txt', leaving 'glyphlist.txt' exactly as distributed by
+ Adobe. Otftotfm reads both files. Requested by Werner Lemberg.
+
+* otftotfm: Add `% WARNMISSING` and `--warn-missing`, so that missing
+ characters result in blots and cause warnings when processed by dvips.
+ Requested by Michael Zedler.
+
+* otfinfo: Add `-v/--font-version` option and document `-t/--tables` option.
+
+* t1reencode: Add many more standard encodings to t1reencode, and fix
+ existing ones. Patch from Peter Betzler.
+
+
+## Version 2.34 – 11.Jun.2005
+
+* otftotfm: Search for 'glyphlist.txt' using kpathsea, and set kpathsea
+ program name to 'lcdftools'. Requested by Karl Berry.
+
+
+## Version 2.33 – 3.Jun.2005
+
+* otftotfm: Include more secondary replacements, including double-bar,
+ centered asterisk, per-ten-thousand, and so forth. Patch from Michael
+ Zedler.
+
+* otftotfm: Add `% POSITION` and `--position`. Requested by Michael
+ Zedler.
+
+
+## Version 2.32 – 31.May.2005
+
+* otftotfm: Report correct dimensions for characters only in the base
+ encoding. Reported by Michael Zedler.
+
+
+## Version 2.31 – 30.May.2005
+
+* otftotfm: Fix crash tickled by constructed characters, reported by
+ Michael Zedler.
+
+* Compilation fixes suggested by Nelson H.F. Beebe.
+
+
+## Version 2.30 – 8.May.2005
+
+* otftotfm: Add support for 'dblbracketleft' and 'dblbracketright'.
+ Secondary replacement can add characters to the font.
+
+* otftotfm: Ligkern commands 'A {5} B' and 'A {L} B' can coexist, leading
+ to a 5-character kern and no ligature. Requested by Michael Zedler.
+
+
+## Version 2.29 – 7.May.2005
+
+* otftotfm: Fix crash reported by Ryuji Suzuki.
+
+* otftotfm: Add support for 'capitalcompwordmark' and
+ 'ascendercompwordmark', requested by Michael Zedler.
+
+* otftotfm: Use OpenType OS/2 table to determine x-height, if available.
+
+
+## Version 2.28 – 25.Apr.2005
+
+* otftotfm: `--math-spacing` doesn't set italic corrections to 0. Thanks
+ to Achim Blumensath.
+
+
+## Version 2.27 – 24.Apr.2005
+
+* otftotfm: Add support for setting kerns: `--ligkern "A {5} B"`. Thanks
+ to Achim Blumensath for a patch.
+
+* otftotfm: Add preliminary support for heuristically-derived math accent
+ positions via a 'skewchar' argument to `--math-spacing`. Thanks again to
+ Achim Blumensath.
+
+
+## Version 2.26 – 2.Apr.2005
+
+* otftotfm: Support more kinds of substitution.
+
+* otftotfm: Support old-style and new-style chaining context substitutions
+ using Adobe's procedure. Older fonts had erroneous substitutions because
+ of a software error; newer fonts don't.
+
+* otftotfm: Fix crash tickled by newer versions of MinionPro and other
+ fonts, reported by Michael Zedler and Oliver M. Haynold.
+
+
+## Version 2.25 – 10.Mar.2005
+
+* otftotfm: Ignore unencoded default ligkerns (don't try to encode their
+ characters). Reported by Michael Zedler.
+
+
+## Version 2.24 – 10.Mar.2005
+
+* otftotfm: Fix assertion failure introduced in 2.23.
+
+
+## Version 2.23 – 8.Mar.2005
+
+* otftotfm: Fix bug present since 2.20 where, for example, `--unicoding
+ "germandbls =: SSsmall"` was ignored in favor of a named 'germandbls'
+ character. Reported by Michael Zedler.
+
+
+## Version 2.22 – 2.Mar.2005
+
+* otftotfm: Include default ligatures unless `--no-default-ligkern` is
+ given. This seems cleaner than the previous semantics (which included
+ the default ligatures unless there were ligatures in the encoding and/or
+ the command line), but it is incompatible. Inspired by question from
+ Christopher Swingely.
+
+
+## Version 2.21 – 16.Feb.2005
+
+* otftotfm: Base fonts include no kerns or ligatures. Requested by Michael
+ Zedler.
+
+* cfftot1: Correctly handle default values for CFF fonts, so that, for
+ example, isFixedPitch is defined to false even when the font doesn't
+ mention it. Requested by Huver.
+
+
+## Version 2.20 – 9.Feb.2005
+
+* otftotfm: Add `--space-factor` and `--math-spacing` options, based on
+ patches from Achim Blumensath.
+
+* otftotfm: Improve handling of explicit `--ligkern` ligatures: they override
+ default ligatures, and any characters mentioned are shoehorned into the
+ encoding. Catalyzed by Michael Zedler.
+
+
+## Version 2.19 – 4.Feb.2005
+
+* otftotfm: Add `--subs-filter`, `--include-subs`, `--exclude-subs`, and
+ `--clear-subs` options (inspired by patch from Achim Blumensath).
+
+* otftotfm: Update documentation and behavior for newer teTeX
+ installations. For instance, run the system 'updmap' by default (unless
+ you give the `--no-updmap` option). This makes automatic mode much
+ easier to set up.
+
+* otftotfm: Output pltotf and vptovf messages to standard error (Achim
+ Blumensath).
+
+* otftotfm: Protect arguments given to the shell (Achim Blumensath).
+
+* otfinfo: Add `-g` option to query all glyphs in a font.
+
+
+## Version 2.18 – 26.Jan.2005
+
+* otftotfm: Fix bug that could cause infinite loops on FreeBSD machines.
+
+
+## Version 2.17 – 4.Jan.2005
+
+* Add t1reencode program. Requested by Ralph Aichinger.
+
+* otftotfm: Add `--output-encoding` option.
+
+* t1lint: Check that UniqueID and XUID values are in range.
+
+
+## Version 2.16 – 19.Nov.2004
+
+* `--include-alternates` and `--exclude-alternates` options only apply to
+ features that appear later in the options list.
+
+* Fix bug where not all `--altselector-feature` features would be used.
+ Problem reported by Emil Lohse.
+
+* Add `--clear-alternates` option.
+
+
+## Version 2.15 – 21.Sep.2004
+
+* AIX compile fixes. Reported by Vladimir Volovich.
+
+* Include RPM .spec file, provided by C.M. Connelly.
+
+
+## Version 2.14 – 16.Sep.2004
+
+* Use AM_MAINTAINER_MODE. Suggested by Karl Berry.
+
+* IRIX compile fixes. Reported by Olaf Weber.
+
+
+## Version 2.13 – 12.Sep.2004
+
+* otftotfm: Check $TEXMF if $VARTEXMF has no writable directory. Reported
+ by Simon Patarin.
+
+* Add `--enable-selfauto-loc` configuration option, enabled by default, to
+ help otftotfm run with TeX configuration files that use SELFAUTODIR and
+ related variables. Suggested by Thomas Esser; mechanism from dvipng.
+
+
+## Version 2.12 – 19.Aug.2004
+
+* Catch bug that would affect otftotfm on 64-bit machines.
+
+
+## Version 2.11 – 18.Aug.2004
+
+* otftotfm: Adjust TDS 1.1 support thanks to Olaf Weber.
+
+
+## Version 2.10 – 18.Aug.2004
+
+* otftotfm: Add preliminary support for the TeX Directory Structure 1.1
+ standard.
+
+* Bug fix that should let us compile on Cygwin. Problem reported by
+ Christian Gudrian.
+
+
+## Version 2.9 – 10.Aug.2004
+
+* otftotfm: Add `--letter-feature` option, inspired by Michael Zedler.
+
+
+## Version 2.8 – 5.Aug.2004
+
+* otftotfm: Fix bug where missing GPOS or GSUB tables would cause an abort.
+ Reported by Ryuji Suzuki.
+
+
+## Version 2.7 – 3.Aug.2004
+
+* otftotfm: Bug fix for obscure cases involving 'dotlessj' characters: the
+ output VPL could contain a reference to "(SETCHAR X)", which is illegal.
+ Reported by Marco Kuhlmann.
+
+
+## Version 2.6 – 12.Jul.2004
+
+* t1testpage adds preliminary support for font smoke proofs with `--smoke`.
+ Requested by Karl Berry.
+
+* t1testpage adds `--glyph` option.
+
+
+## Version 2.5 – 6.Jul.2004
+
+* Support compilation with gcc-3.4.1. Reported by Thomas Esser.
+
+
+## Version 2.4 – 30.Jun.2004
+
+* cfftot1: Fix off-by-one bug where the encoding of the last encoded
+ character was ignored, reported by Detlev Droege.
+
+* otftotfm: Some internal changes; bugs are possible.
+
+
+## Version 2.3 – 15.Jun.2004
+
+* otftotfm: Add `--default-ligkern` and `--no-encoding-commands` options,
+ to address problem with "t1.enc" reported by Ulrich Dirr.
+
+* otftotfm documentation updates.
+
+
+## Version 2.2 – 8.May.2004
+
+* otftotfm: 't1dotlessj' errors don't prevent 'psfonts.map' from being
+ updated. Reported by Stephen Moye.
+
+* t1dotlessj: Report different kinds of errors with different exit statuses.
+
+
+## Version 2.1 – 5.Apr.2004
+
+* otftotfm: Warn if no encoding specified. Requested by Zsolt Kiraly.
+
+* otftotfm: Improve documentation, particularly by adding example run with
+ ".fd" file.
+
+
+## Version 2.0 – 21.Mar.2004
+
+* mmpfb, t1dotlessj, t1lint, t1testpage: On Windows, add _O_BINARY flag
+ when appropriate. Reported by Fabrice Popineau.
+
+
+## Version 1.99 – 24.Feb.2004
+
+* otftotfm: Fix overfull encoding bug that could cause an assertion
+ failure, reported by Adam Lindsay.
+
+* otftotfm: Speed improvement.
+
+
+## Version 1.98 – 22.Feb.2004
+
+* otftotfm: Add support for 'SSsmall' glyph. Einar Smith noted that the
+ OpenType 'smcp' feature doesn't translate the sharp-S character to
+ small-caps "SS" in most fonts. Now, add `--unicoding "germandbls =:
+ SSsmall"` to get that behavior.
+
+* otftotfm: Compilation fix for problem reported by Nelson H.F. Beebe.
+
+
+## Version 1.97 – 6.Feb.2004
+
+* cfftot1: Fix bug in handling fonts with supplemental encodings. Problem
+ reported by Eike <eiked>.
+
+
+## Version 1.96 – 11.Jan.2004
+
+* otftotfm: Handle alternate characters like 'Q.alt' in the input encoding:
+ map them to the actual alternate glyph, rather than to the base Unicode
+ value ('Q'). Reported by Ulrich Dirr.
+
+
+## Version 1.95 – 3.Jan.2004
+
+* otftotfm: Add automatic support for t1dotlessj. If the desired encoding
+ has a 'dotlessj' character, and the input font doesn't, then otftotfm
+ will run 't1dotlessj', create a dotless-J font, and include it using
+ virtual fonts.
+
+* otftotfm: Avoid warnings about bad "(STOP)" commands in pltotf
+ (introduced by the `--min-kern` facility).
+
+
+## Version 1.91 – 31.Dec.2003
+
+* mmpfb, t1dotlessj: Fix sidebearing problems.
+
+
+## Version 1.90 – 29.Dec.2003
+
+* mmpfb: Fix behavior with Adobe Jenson and other fonts with intermediate
+ masters, and `--minimize` output, which had been broken since 1.65.
+
+* Add t1dotlessj program.
+
+
+## Version 1.88 – 23.Dec.2003
+
+* otfinfo: Change coding to be friendlier to older C++ compilers. Requested
+ by Ulrich Dirr.
+
+
+## Version 1.87 – 22.Dec.2003
+
+* otftotfm: Fix `--extend` bug reported by Ulrich Dirr (the expansion factor
+ was formerly applied to character heights and depths, not widths).
+
+
+## Version 1.86 – 19.Dec.2003
+
+* otftotfm: Change where `--base` is added to support pdftex: If the font
+ name is "WarnoPro+10", the base font name is "WarnoPro--base+10".
+ Reported by Ulrich Dirr.
+
+
+## Version 1.85 – 10.Dec.2003
+
+* otftotfm: Add `--altselector-feature` option, so you can specify the
+ features activated by `--altselector-char`. Defaults to salt and dlig.
+
+* otftotfm: Fix intermittent hang.
+
+
+## Version 1.80 – 4.Dec.2003
+
+* otftotfm: Add `--altselector-char` option, and `--include-alternates` and
+ `--exclude-alternates` options. These options support access to alternate
+ characters through ligatures, using a mechanism originally planned by Sivan
+ Toledo ("Exploiting Rich Fonts", TUGboat 21(2), 2000). Requested by Martin
+ Budaj.
+
+* Add default encoding for 'SS' character (same as 'Germandbls'). Reported
+ by Ulrich Dirr.
+
+
+## Version 1.75 – 3.Dec.2003
+
+* cfftot1: Handle the case when 'hintmask' is the first operator in a Type 2
+ charstring. Reported by Tom Kacvinsky.
+
+
+## Version 1.70 – 1.Dec.2003
+
+* otftotfm: Add `--min-kern` option requested by Ulrich Dirr.
+
+* mmafm: Add `--min-kern` as a preferred synonym for `--kern-precision`.
+
+
+## Version 1.67 – 29.Nov.2003
+
+* otftotfm: Don't run off the end of an array. Bug reported and patch
+ provided by Akira Kakuto.
+
+
+## Version 1.66 – 24.Nov.2003
+
+* cfftot1: Don't generate "currentfile eexec" twice. Bug reported by Adam
+ Lindsay.
+
+
+## Version 1.65 – 24.Nov.2003
+
+* otftotfm: Include default ligatures if user does not specify ligatures.
+ Requested by Adam Lindsay.
+
+* otftotfm: Generated VPL includes FONTDSIZE when referring to base. Bug
+ reported by Adam Lindsay.
+
+* Preliminary support for CID-keyed OpenType fonts.
+
+
+## Version 1.60 – 7.Oct.2003
+
+* cfftot1: Support fonts using the 'seac' operator. Requested by Ralf
+ Koenig.
+
+
+## Version 1.52 – 4.Sep.2003
+
+* otftotfm: Add `--design-size` option requested by Johannes Kuester.
+
+* t1testpage: Fix `--help` and add manual page at C.M. Connelly's request.
+
+
+## Version 1.51 – 2.Sep.2003
+
+* otftotfm: Generated TFM and PL files have DESIGNSIZE set to the font's
+ actual design size, as read from the 'size' feature. Requested by
+ Johannes Kuester.
+
+
+## Version 1.50 – 26.Aug.2003
+
+* Minor compilation fix; problem reported by Nelson H.F. Beebe.
+
+
+## Version 1.50b4 – 26.Aug.2003
+
+* otfinfo: Minor compilation fix from Tom Kacvinsky.
+
+
+## Version 1.50b3 – 25.Aug.2003
+
+* cfftot1: Emit UniqueID as an integer. Reported by Tom Kacvinsky.
+
+* otftotfm: `--without-kpathsea` fix. Patch provided by Adam Lindsay.
+
+* More compilation fixes provided by Tom Kacvinsky.
+
+
+## Version 1.50b2 – 24.Aug.2003
+
+* otfinfo: New program, requested by Adam Lindsay.
+
+* otftotfm: The `--query-scripts` and `--query-features` options are no
+ longer supported. Use `otfinfo -s` and `otfinfo -f` instead.
+
+* otftotfm: Fix crash reported by Adam Lindsay.
+
+* otftotfm: In automatic mode, after modifying a 'psfonts.map' file, run
+ the script 'TEXMF/dvips/updmap' if present.
+
+* Compilation fixes for Solaris provided by Tom Kacvinsky and Nelson
+ H.F. Beebe.
+
+
+## Version 1.50b1 – 20.Aug.2003
+
+* Integrate mminstance (the mmafm and mmpfb programs), and bump the version
+ number to reflect this.
+
+
+## Version 0.53 – 10.Aug.2003
+
+* Fix problem with Type 1 output in `--without-kpathsea` reported by Adam
+ Lindsay.
+
+* Fix crash on encodings containing 'emptyslot' reported by Marco Kuhlmann.
+
+
+## Version 0.52 – 7.Aug.2003
+
+* Attempt to fix some build problems reported by Nelson H.F. Beebe.
+
+
+## Version 0.51 – 5.Aug.2003
+
+* otftotfm: Fix crashes with small encodings and absent boundary
+ characters. Reported by Bruce D'Arcus.
+
+* otftotfm: Add `--boundary-char` and `--kpathsea-debug` options.
+
+
+## Version 0.50 – 4.Aug.2003
+
+* otftotfm: Handle more complex substitutions, such as those required to
+ support `-fordn` and `-ffrac`.
+
+* otftotfm: The output virtual and base fonts can have different
+ "encodings" with overlapping encoding slots. This can make fonts more
+ compact.
+
+* When assigning slots to introduced characters, otftotfm prefers
+ characters introduced by earlier lookups. This follows the spirit of the
+ OpenType specification, since early lookups in some ways "override" later
+ ones. The previous scoring mechanism remains in force within each
+ individual lookup.
+
+* otftotfm: Rewrite GsubEncoding to Metrics, changing its fundamental
+ abstraction (to two-ligatures). Simpler and cleaner overall.
+
+* otftotfm TODO: Ligatures that apply to middle or right context (for
+ example, the two substitutions "a b c d => a b c y" and "b c => x" should
+ combine to "a b c d => a x y", but they won't yet).
+
+
+## Version 0.19 – 30.Jul.2003
+
+* otftotfm: Add support for 'emptyslot' UNICODINGs. Requested by Marco
+ Kuhlmann.
+
+
+## Version 0.18 – 9.Jul.2003
+
+* Otftotfm will now synthesize characters for some T1 glyphs automatically,
+ specifically 'cwm' (compound word mark), 'visualspace', and 'Germandbls'.
+ Requested by Marco Kuhlmann.
+
+* The glyphlist.txt file contains Unicode mappings for character names
+ found in the BlueSky Computer Modern math italic and symbol fonts.
+
+* It also contains fake Unicode mappings for the 'cwm', 'visualspace', and
+ 'Germandbls' characters found in EC.enc.
+
+* otftotfm: Don't output a KRN between two characters if there exists a LIG
+ for those two characters.
+
+
+## Version 0.17 – 6.Jul.2003
+
+* otftotfm: Ligatures removed with LIGKERN commands won't show up in the
+ encoding.
+
+* Improve scoring heuristics by which otftotfm decides which characters are
+ more important (for when there isn't enough encoding space for all new
+ glyphs).
+
+
+## Version 0.16 – 6.Jul.2003
+
+* otftotfm: In automatic mode, store dvips files (encodings and
+ psfonts.map) in 'TEXMF/dvips/VENDOR', rather than 'TEXMF/dvips'. Users of
+ previous versions will probably want to move their 'TEXMF/dvips/a_*.enc'
+ and 'TEXMF/dvips/lcdftools.map' files to a 'TEXMF/dvips/lcdftools/'
+ directory, and run 'mktexlsr TEXMF'.
+
+* otftotfm: When there isn't enough encoding space for all new glyphs,
+ prefer shorter ligatures made out of regular letters -- for instance,
+ prefer f_j to f_f_j, and T_h to f_iacute. Requested by Bruce D'Arcus.
+
+* otftotfm: Add `--ligkern` and `--unicoding` options.
+
+* otftotfm: Add `--coding-scheme` option and `% CODINGSCHEME` encoding
+ comment, to define the PL/TFM coding scheme for the font. Apparently
+ fontinst actually looks at the coding scheme. Also, when you specify a
+ coding scheme, set DESIGNUNITS to 1, again to satisfy fontinst. Requested
+ by Marco Kuhlmann.
+
+* otftotfm: Remove virtual font 'N.vf' when installing a regular font
+ 'N.tfm' in automatic mode. This reduces the risk that an old virtual font
+ will screw up your installation.
+
+
+## Version 0.15 – 4.Jul.2003
+
+* otftotfm: Bug fix: Don't multiply apply substitutions and kerns from the
+ same lookup.
+
+* otftotfm: Supports simple left-contextual substitutions, necessary for
+ ExPontoPro's 'calt' (Contextual Alternates) feature.
+
+
+## Version 0.14 – 2.Jul.2003
+
+* otftotfm: Add `-L/--letterspacing` option at Bruce D'Arcus's request.
+
+* otftotfm: Hypothetically supports the contextual substitutions necessary
+ for the 'init' (Initial Forms) feature.
+
+* otftotfm: When you make a virtual font named "foo", remove any entries
+ for "foo" from VENDOR.map.
+
+
+## Version 0.13 – 27.Jun.2003
+
+* `--without-kpathsea` works. Problem reported by Adam Lindsay.
+
+
+## Version 0.12 – 27.Jun.2003
+
+* otftotfm: Better error messages when directories cannot be found.
+ Reported by Bruce D'Arcus.
+
+
+## Version 0.11 – 26.Jun.2003
+
+* otftotfm: Handles the contextual substitutions necessary for 'cswh'
+ (Contextual Swash) and 'fina' (Terminal Forms) features.
+
+
+## Version 0.10 – 26.Jun.2003
+
+* otftotfm: Update ls-R files for new encodings.
+
+
+## Version 0.9 – 25.Jun.2003
+
+* otftotfm: psfonts.map lines contain the file name only (no directories).
+ Requested by Norbert Preining.
+
+* otftotfm: Properly report errors when encoding files can't be found.
+
+* Fix kpathsea searching and dependency problems reported by Bruce D'Arcus
+ and Claire Connelly, among others.
+
+* Fix templates to allow compilation with GCC 2.95.
+
+
+## Version 0.8 – 23.Jun.2003
+
+* otftopl has been renamed to otftotfm. The new program takes different
+ options. Automatic mode is particularly different, and TFM output is now
+ the default.
+
+* otftotfm: Automatic mode now sticks files into a TeX Directory Structure
+ hierarchy. This works well with many TeX installations. It also
+ automatically translates OpenType fonts into Type 1 PostScript with
+ cfftot1 (unless you configure with `--disable-cfftot1`), and modifies a
+ psfonts.map file for each font. See the manual page for more information.
+
+* otftotfm: Generates virtual fonts when required to support glyph
+ positioning features. (`-f cpsp` is one example.)
+
+* otftotfm: Warns when a feature could not be completely implemented.
+
+* otftotfm: Add `--verbose` and `--no-create` options, among others
+ (`--no-virtual`, `--map-file`, `--vendor`, `--typeface`, `--no-type1`...).
+
+* otftotfm: Encoding files are now named "a_SIGNATURE.enc", not
+ "auto_SIGNATURE.enc".
+
+* The configure script now searches for the kpathsea library, since
+ otftotfm's automatic mode depends on kpathsea. Provide
+ `--without-kpathsea` to disable it.
+
+
+## Version 0.7 – 13.Jun.2003
+
+* cfftot1: Fix bug to handle MinionPro-Italic without crashing.
+
+
+## Version 0.6 – 12.Jun.2003
+
+* cfftot1: Fix definitions of Subrs entries 1 and 2; now fonts with flex
+ hints will work.
+
+* cfftot1: Reduce noise generated by fonts with flex hints.
+
+* cfftot1: Generates valid character strings for characters whose first
+ point is at the origin. (Previously, such charstrings wouldn't begin with
+ a "moveto".)
+
+* otftopl: Support simple context substitutions and chained context
+ substitutions. Required to support ACaslonPro-Italic's "swsh" feature.
+ Reported by Adam Lindsay <atl at comp.lancs.ac.uk>.
+
+* otftopl: Prefer `--query-features` and `--query-scripts` to
+ `--print-features` and `--print-scripts`.
+
+* otftopl: Better warnings and error messages for bad LIGKERN/UNICODING
+ commands in encoding files, and when there isn't enough room in an
+ encoding for ligature glyphs.
+
+* t1lint: Reads stdin if no filenames supplied on the command line.
+
+
+## Version 0.5 – 5.Jun.2003
+
+* Template reorganization so the typetools compile with GCC 3.3.
+
+
+## Version 0.4 – 3.Jun.2003
+
+* otftopl: Added `--slant` and `--extend` options.
+
+* otftopl's generated encodings have slightly different form, and are thus
+ friendlier to ps2pk's bad parser.
+
+
+## Version 0.3 – 3.Jun.2003
+
+* Fixed bug: cfftot1 produced invalid results for fonts with encodings
+ other than StandardEncoding, due to a misbehavior in the way Type 1 fonts
+ were stored. Reported by Vladimir Volovich <vvv at vsu.ru>.
+
+
+## Version 0.2 – 3.Jun.2003
+
+* Fix CFF parsing bugs and configure errors reported by Vladimir Volovich
+ <vvv at vsu.ru>.
+
+
+## Version 0.1 – 2.Jun.2003
+
+* Initial release.
+
+* See also the ONEWS file for older news about mmafm and mmpfb.
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/README.md
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/README.md 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/README.md 2016-06-22 06:25:09 UTC (rev 41518)
@@ -99,7 +99,7 @@
Copyright and license
---------------------
-All source code is Copyright (c) 1997-2015 Eddie Kohler.
+All source code is Copyright (c) 1997-2016 Eddie Kohler.
This code is distributed under the GNU General Public License, Version 2
(and only Version 2). The GNU General Public License is available via the
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/autoconf.h.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/autoconf.h.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/autoconf.h.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -9,6 +9,9 @@
/* Define if the va_list type is addressable. */
#undef HAVE_ADDRESSABLE_VA_LIST
+/* Define to incldue Adobe code in output fonts. */
+#undef HAVE_ADOBE_CODE
+
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = cfftot1$(EXEEXT)
-subdir = lcdf-typetools-src/cfftot1
+subdir = cfftot1
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -115,10 +103,6 @@
am_cfftot1_OBJECTS = cfftot1.$(OBJEXT) maket1font.$(OBJEXT)
cfftot1_OBJECTS = $(am_cfftot1_OBJECTS)
cfftot1_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -132,22 +116,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -154,18 +134,12 @@
am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
@@ -226,14 +200,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -247,19 +218,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -269,27 +235,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -298,9 +252,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -307,16 +259,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -323,11 +271,7 @@
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@
@@ -336,11 +280,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -376,7 +316,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -386,9 +326,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/cfftot1/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign cfftot1/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/cfftot1/Makefile
+ $(AUTOMAKE) --foreign cfftot1/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -416,7 +356,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -431,8 +370,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -448,13 +387,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
cfftot1$(EXEEXT): $(cfftot1_OBJECTS) $(cfftot1_DEPENDENCIES) $(EXTRA_cfftot1_DEPENDENCIES)
@rm -f cfftot1$(EXEEXT)
@@ -470,34 +403,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/maket1font.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -664,7 +581,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -719,8 +636,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -737,18 +653,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/cfftot1.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/cfftot1.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/cfftot1.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,4 +1,4 @@
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/cfftot1.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/cfftot1.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/cfftot1.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* cfftot1.cc -- driver for translating CFF fonts to Type 1 fonts
*
- * Copyright (c) 2002-2014 Eddie Kohler
+ * Copyright (c) 2002-2016 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
@@ -71,7 +71,7 @@
if (!error_message)
errh->message("Usage: %s [OPTIONS] [FONTFILE [OUTPUTFILE]]", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -221,7 +221,7 @@
case VERSION_OPT:
printf("cfftot1 (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2002-2013 Eddie Kohler\n\
+ printf("Copyright (C) 2002-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/maket1font.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/maket1font.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/maket1font.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* maket1font.{cc,hh} -- translate CFF fonts to Type 1 fonts
*
- * Copyright (c) 2002-2012 Eddie Kohler
+ * Copyright (c) 2002-2016 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
@@ -50,7 +50,7 @@
// output
Type1Font *_output;
- bool _flex_message;
+ int _flex_message;
// subroutines
int _subr_bias;
@@ -146,7 +146,7 @@
**/
MakeType1CharstringInterp::MakeType1CharstringInterp(int precision)
- : Type1CharstringGenInterp(precision), _flex_message(false)
+ : Type1CharstringGenInterp(precision), _flex_message(0)
{
}
@@ -405,11 +405,23 @@
{
Type1CharstringGenInterp::run(g, out);
- if (Type1CharstringGenInterp::bad_flex() && !_flex_message) {
+ if (Type1CharstringGenInterp::had_bad_flex() && !(_flex_message & 1)) {
errh->lwarning(landmark(errh), "complex flex hint replaced with curves");
- errh->message("(This Type 2 format font contains flex hints prohibited by Type 1.\nI%,ve safely replaced them with ordinary curves.)");
- _flex_message = true;
+ errh->message("(This font contains flex hints prohibited by Type 1. They%,ve been\nreplaced by ordinary curves.)");
+ _flex_message |= 1;
}
+#if !HAVE_ADOBE_CODE
+ if (Type1CharstringGenInterp::had_flex() && !(_flex_message & 2)) {
+ errh->lwarning(landmark(errh), "flex hints required");
+ errh->message("(This program was compiled without Adobe code for flex hint support,\nso its output may not work on all devices.)");
+ _flex_message |= 2;
+ }
+ if (Type1CharstringGenInterp::had_hr() && !(_flex_message & 4)) {
+ errh->lwarning(landmark(errh), "hint replacement required");
+ errh->message("(This program was compiled without Adobe code for hint replacement,\nso its output may not work on all devices.)");
+ _flex_message |= 4;
+ }
+#endif
}
void
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/configure.ac
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/configure.ac 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/configure.ac 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([lcdf-typetools], [2.105])
-AC_CONFIG_SRCDIR([NEWS])
+AC_INIT([lcdf-typetools], [2.106])
+AC_CONFIG_SRCDIR([NEWS.md])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([autoconf.h])
AM_MAINTAINER_MODE
@@ -24,7 +24,14 @@
AC_DEFINE([HAVE_PRECONDITION_CHECKING], [1], [Define to include precondition checking assertions.])
fi])
+AC_ARG_ENABLE([adobe-code],
+ [AS_HELP_STRING([--disable-adobe-code], [do not include Adobe code])],
+ [], [enable_adobe_code=yes])
+if test "$enable_adobe_code" = yes; then
+ AC_DEFINE([HAVE_ADOBE_CODE], [1], [Define to incldue Adobe code in output fonts.])
+fi
+
dnl AN_MAKEVAR([AR], [AC_PROG_AR])
dnl AN_PROGRAM([ar], [AC_PROG_AR])
dnl AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/glyphlist.txt
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/glyphlist.txt 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/glyphlist.txt 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,43 +1,26 @@
-# ###################################################################################
-# Copyright (c) 1997,1998,2002,2007 Adobe Systems Incorporated
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this documentation file to use, copy, publish, distribute,
-# sublicense, and/or sell copies of the documentation, and to permit
-# others to do the same, provided that:
-# - No modification, editing or other alteration of this document is
-# allowed; and
-# - The above copyright notice and this permission notice shall be
-# included in all copies of the documentation.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this documentation file, to create their own derivative works
-# from the content of this document to use, copy, publish, distribute,
-# sublicense, and/or sell the derivative works, and to permit others to do
-# the same, provided that the derived work is not represented as being a
-# copy or version of this document.
-#
-# Adobe shall not be liable to any party for any loss of revenue or profit
-# or for indirect, incidental, special, consequential, or other similar
-# damages, whether based on tort (including without limitation negligence
-# or strict liability), contract or other legal or equitable grounds even
-# if Adobe has been advised or had reason to know of the possibility of
-# such damages.\xCA The Adobe materials are provided on an "AS IS" basis.\xCA
-# Adobe specifically disclaims all express, statutory, or implied
-# warranties relating to the Adobe materials, including but not limited to
-# those concerning merchantability or fitness for a particular purpose or
-# non-infringement of any third party rights regarding the Adobe
-# materials.
-# ###################################################################################
+# -----------------------------------------------------------
+# Copyright 2002, 2010, 2015 Adobe Systems Incorporated.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you
+# may not use this file except in compliance with the License. You may
+# obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0.html
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+# -----------------------------------------------------------
# Name: Adobe Glyph List
# Table version: 2.0
# Date: September 20, 2002
+# URL: https://github.com/adobe-type-tools/agl-aglfn
#
-# See http://partners.adobe.com/asn/developer/typeforum/unicodegn.html
+# Format: two semicolon-delimited fields:
+# (1) glyph name--upper/lowercase letters and digits
+# (2) Unicode scalar value--four uppercase hexadecimal digits
#
-# Format: Semicolon-delimited fields:
-# (1) glyph name
-# (2) Unicode scalar value
A;0041
AE;00C6
AEacute;01FC
@@ -4319,4 +4302,4 @@
zstroke;01B6
zuhiragana;305A
zukatakana;30BA
-#--end
+#END
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/efont/t1csgen.hh
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/efont/t1csgen.hh 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/efont/t1csgen.hh 2016-06-22 06:25:09 UTC (rev 41518)
@@ -59,7 +59,9 @@
int nhints() const { return _stem_hstem.size(); }
double max_flex_height() const { return _max_flex_height; }
- bool bad_flex() const { return _bad_flex; }
+ bool had_flex() const { return _had_flex; }
+ bool had_bad_flex() const { return _had_bad_flex; }
+ bool had_hr() const { return _had_hr; }
const Type1CharstringGen &csgen() const { return _csgen; }
@@ -102,7 +104,9 @@
// Flex
double _max_flex_height;
- bool _bad_flex;
+ bool _had_flex;
+ bool _had_bad_flex;
+ bool _had_hr;
inline void gen_number(double, int = 0);
inline void gen_command(int);
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/clp.h
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/clp.h 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/clp.h 2016-06-22 06:25:09 UTC (rev 41518)
@@ -8,7 +8,7 @@
/* clp.h - Public interface to CLP.
* This file is part of CLP, the command line parser package.
*
- * Copyright (c) 1997-2013 Eddie Kohler, ekohler at gmail.com
+ * Copyright (c) 1997-2016 Eddie Kohler, ekohler at gmail.com
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/error.hh
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/error.hh 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/error.hh 2016-06-22 06:25:09 UTC (rev 41518)
@@ -234,7 +234,7 @@
* @param val format arguments
*
* Shorthand for xmessage(@a anno, vformat(@a fmt, @a val)). */
- int vxmessage(const String &anno, const char *fmt, va_list val) {
+ int xmessage(const String &anno, const char *fmt, va_list val) {
return xmessage(anno, vformat(fmt, val));
}
/** @brief Print an error message, adding landmark and other annotations.
@@ -257,8 +257,8 @@
*
* Shorthand for xmessage(@a landmark, @a anno, vformat(@a fmt, @a
* val)). */
- int vxmessage(const String &landmark, const String &anno,
- const char *fmt, va_list val) {
+ int xmessage(const String &landmark, const String &anno,
+ const char *fmt, va_list val) {
return xmessage(landmark, anno, vformat(fmt, val));
}
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/permstr.hh
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/permstr.hh 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/permstr.hh 2016-06-22 06:25:09 UTC (rev 41518)
@@ -35,6 +35,9 @@
inline int length() const;
char operator[](int i) const;
+ inline const char* data() const {
+ return _rep;
+ }
inline const char *c_str() const {
return _rep;
}
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/vector.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/vector.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/include/lcdf/vector.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -7,7 +7,7 @@
*
* Copyright (c) 1999-2000 Massachusetts Institute of Technology
* Copyright (c) 2001-2003 International Computer Science Institute
- * Copyright (c) 1999-2012 Eddie Kohler
+ * Copyright (c) 1999-2016 Eddie Kohler
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/lcdf-typetools.spec
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/lcdf-typetools.spec 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/lcdf-typetools.spec 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
Summary: Programs to manipulate OpenType and multiple-master fonts
Name: lcdf-typetools
-Version: 2.105
+Version: 2.106
Copyright: GPL
Vendor: Little Cambridgeport Design Factory <http://www.lcdf.org/>
Group: Utilities/Printing
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,22 +86,10 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = lcdf-typetools-src/libefont
+subdir = libefont
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -110,6 +98,7 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
ARFLAGS = cru
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
@@ -142,26 +131,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -192,14 +173,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -213,19 +191,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -235,27 +208,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -264,9 +225,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -273,16 +232,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -289,11 +244,7 @@
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@
@@ -302,11 +253,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -372,7 +319,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -382,9 +329,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/libefont/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libefont/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/libefont/Makefile
+ $(AUTOMAKE) --foreign libefont/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -451,35 +398,19 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ttfkern.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
@@ -599,8 +530,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
- mostlyclean-am
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -655,8 +585,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -671,18 +600,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am 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-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ 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-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 tags-am uninstall uninstall-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afm.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afm.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afm.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* afm.{cc,hh} -- Adobe Font Metrics files
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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,7 @@
{
va_list val;
va_start(val, format);
- _errh->vxmessage(_l.landmark(), ErrorHandler::e_warning, format, val);
+ _errh->xmessage(_l.landmark(), ErrorHandler::e_warning, format, val);
va_end(val);
}
@@ -73,7 +73,7 @@
{
va_list val;
va_start(val, format);
- _errh->vxmessage(_l.landmark(), ErrorHandler::e_error, format, val);
+ _errh->xmessage(_l.landmark(), ErrorHandler::e_error, format, val);
va_end(val);
}
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afmparse.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afmparse.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afmparse.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* afmparse.{cc,hh} -- Adobe Font Metrics parsing
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afmw.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afmw.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/afmw.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* afmw.{cc,hh} -- Adobe Font Metrics writing
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/amfm.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/amfm.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/amfm.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* amfm.{cc,hh} -- Adobe Multiple-Master Font Metrics
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
@@ -285,7 +285,7 @@
{
va_list val;
va_start(val, format);
- _errh->vxmessage(_l.landmark(), ErrorHandler::e_warning, format, val);
+ _errh->xmessage(_l.landmark(), ErrorHandler::e_warning, format, val);
va_end(val);
}
@@ -294,7 +294,7 @@
{
va_list val;
va_start(val, format);
- _errh->vxmessage(_l.landmark(), ErrorHandler::e_error, format, val);
+ _errh->xmessage(_l.landmark(), ErrorHandler::e_error, format, val);
va_end(val);
}
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* cff.{cc,hh} -- Compact Font Format fonts
*
- * Copyright (c) 1998-2014 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/encoding.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/encoding.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/encoding.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* encoding.{cc,hh} -- 8-bit encodings
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/findmet.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/findmet.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/findmet.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* findmet.{cc,hh} -- find font metrics
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/metrics.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/metrics.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/metrics.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* metrics.{cc,hh} -- generic font metrics
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otf.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otf.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otf.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* otf.{cc,hh} -- OpenType font basics
*
- * Copyright (c) 2002-2012 Eddie Kohler
+ * Copyright (c) 2002-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfcmap.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfcmap.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfcmap.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* otfcmap.{cc,hh} -- OpenType cmap table
*
- * Copyright (c) 2002-2012 Eddie Kohler
+ * Copyright (c) 2002-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfdata.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfdata.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfdata.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* otfdata.{cc,hh} -- OpenType bounds-checked string type
*
- * Copyright (c) 2003-2014 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfdescrip.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfdescrip.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfdescrip.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* otfdescrip.cc -- descriptions for OpenType tags
*
- * Copyright (c) 2002-2012 Eddie Kohler
+ * Copyright (c) 2002-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfgpos.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfgpos.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfgpos.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* otfgpos.{cc,hh} -- OpenType GPOS table
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfgsub.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfgsub.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfgsub.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* otfgsub.{cc,hh} -- OpenType GSUB table
*
- * Copyright (c) 2003-2014 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfname.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfname.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfname.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* otfname.{cc,hh} -- OpenType name table
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfos2.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfos2.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfos2.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* otfos2.{cc,hh} -- OpenType OS/2 table
*
- * Copyright (c) 2005-2012 Eddie Kohler
+ * Copyright (c) 2005-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfpost.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfpost.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/otfpost.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* otfpost.{cc,hh} -- OpenType post table
*
- * Copyright (c) 2006-2012 Eddie Kohler
+ * Copyright (c) 2006-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/pairop.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/pairop.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/pairop.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* pairop.{cc,hh} -- ligature/kern font metrics
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/psres.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/psres.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/psres.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* psres.{cc,hh} -- PSres.upr files
*
- * Copyright (c) 1999-2012 Eddie Kohler
+ * Copyright (c) 1999-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1bounds.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1bounds.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1bounds.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* t1bounds.{cc,hh} -- charstring bounding box finder
*
- * Copyright (c) 1998-2014 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1cs.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1cs.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1cs.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* t1cs.{cc,hh} -- Type 1/2 charstrings
*
- * Copyright (c) 1998-2014 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1csgen.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1csgen.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1csgen.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* t1csgen.{cc,hh} -- Type 1 charstring generation
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
@@ -293,7 +293,8 @@
Type1CharstringGenInterp::Type1CharstringGenInterp(int precision)
: _csgen(precision), _hint_csgen(precision),
_direct_hr(false), _hr_storage(0),
- _max_flex_height(0), _bad_flex(false)
+ _max_flex_height(0),
+ _had_flex(false), _had_bad_flex(false), _had_hr(false)
{
}
@@ -441,6 +442,7 @@
subrno = nsubrs;
if (subrno >= 0) {
+ _had_hr = true;
_csgen.gen_number(subrno);
_csgen.gen_number(4);
_csgen.gen_command(Cs::cCallsubr);
@@ -543,6 +545,7 @@
// generate flex commands
if (v_ok || h_ok) {
+ _had_flex = true;
Point p_reference = (h_ok ? Point(p3_4.x, p0.y) : Point(p0.x, p3_4.y));
_csgen.gen_number(1);
@@ -586,7 +589,7 @@
if (flex_height > _max_flex_height)
_max_flex_height = flex_height;
} else {
- _bad_flex = true;
+ _had_bad_flex = true;
act_curve(cmd, p0, p1, p2, p3_4);
act_curve(cmd, p3_4, p5, p6, p7);
}
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1font.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1font.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1font.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* t1font.{cc,hh} -- Type 1 font
*
- * Copyright (c) 1998-2014 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1fontskel.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1fontskel.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1fontskel.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* t1fontskel.cc -- Type 1 font skeleton
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
@@ -24,191 +24,90 @@
#include <ctype.h>
namespace Efont {
-static const char *othersubrs_code = "% Copyright (c) 1987-1990 Adobe Systems Incorporated.\n"
-"% All Rights Reserved.\n"
-"% This code to be used for Flex and hint replacement.\n"
-"% Version 1.1\n"
-"/OtherSubrs\n"
-"[systemdict /internaldict known\n"
-"{1183615869 systemdict /internaldict get exec\n"
-"/FlxProc known {save true} {false} ifelse}\n"
-"{userdict /internaldict known not {\n"
-"userdict /internaldict\n"
-"{count 0 eq\n"
-"{/internaldict errordict /invalidaccess get exec} if\n"
-"dup type /integertype ne\n"
-"{/internaldict errordict /invalidaccess get exec} if\n"
-"dup 1183615869 eq\n"
-"{pop 0}\n"
-"{/internaldict errordict /invalidaccess get exec}\n"
-"ifelse\n"
-"}\n"
-"dup 14 get 1 25 dict put\n"
-"bind executeonly put\n"
-"} if\n"
-"1183615869 userdict /internaldict get exec\n"
-"/FlxProc known {save true} {false} ifelse}\n"
-"ifelse\n"
+#if HAVE_ADOBE_CODE
+
+static const char* othersubrs_code =
+// This version of the OtherSubrs code for old PostScript interpreters comes from
+// https://github.com/adobe-type-tools/afdko/blob/master/FDK/Tools/Programs/public/lib/source/t1write/t1write_flexothers.txt
+// (commit 3f4eeec). The Adobe Font Development Kit is licensed by the Apache
+// License, 2.0, which permits this embedding.
+"% Copyright 1987-1990 Adobe Systems Incorporated. All rights reserved.\n"
+"/OtherSubrs[systemdict/internaldict known{1183615869 systemdict/internaldict\n"
+"get exec/FlxProc known{save true}{false}ifelse}{userdict/internaldict known\n"
+"not{userdict/internaldict{count 0 eq{/internaldict errordict/invalidaccess get\n"
+"exec}if dup type/integertype ne{/internaldict errordict/invalidaccess get exec\n"
+"}if dup 1183615869 eq{pop 0}{/internaldict errordict/invalidaccess get exec}\n"
+"ifelse}dup 14 get 1 25 dict put bind executeonly put}if 1183615869 userdict\n"
+"/internaldict get exec/FlxProc known{save true}{false}ifelse}ifelse[systemdict\n"
+"/internaldict known not{100 dict/begin cvx/mtx matrix/def cvx}if systemdict\n"
+"/currentpacking known{currentpacking true setpacking}if{systemdict\n"
+"/internaldict known{1183615869 systemdict/internaldict get exec dup/$FlxDict\n"
+"known not{dup dup length exch maxlength eq{pop userdict dup/$FlxDict known not\n"
+"{100 dict begin/mtx matrix def dup/$FlxDict currentdict put end}if}{100 dict\n"
+"begin/mtx matrix def dup/$FlxDict currentdict put end}ifelse}if/$FlxDict get\n"
+"begin}if grestore/exdef{exch def}def/dmin exch abs 100 div def/epX exdef/epY\n"
+"exdef/c4y2 exdef/c4x2 exdef/c4y1 exdef/c4x1 exdef/c4y0 exdef/c4x0 exdef/c3y2\n"
+"exdef/c3x2 exdef/c3y1 exdef/c3x1 exdef/c3y0 exdef/c3x0 exdef/c1y2 exdef/c1x2\n"
+"exdef/c2x2 c4x2 def/c2y2 c4y2 def/yflag c1y2 c3y2 sub abs c1x2 c3x2 sub abs gt\n"
+"def/PickCoords{{c1x0 c1y0 c1x1 c1y1 c1x2 c1y2 c2x0 c2y0 c2x1 c2y1 c2x2 c2y2}{\n"
+"c3x0 c3y0 c3x1 c3y1 c3x2 c3y2 c4x0 c4y0 c4x1 c4y1 c4x2 c4y2}ifelse/y5 exdef/x5\n"
+"exdef/y4 exdef/x4 exdef/y3 exdef/x3 exdef/y2 exdef/x2 exdef/y1 exdef/x1 exdef\n"
+"/y0 exdef/x0 exdef}def mtx currentmatrix pop mtx 0 get abs 1e-05 lt mtx 3 get\n"
+"abs 1e-05 lt or{/flipXY -1 def}{mtx 1 get abs 1e-05 lt mtx 2 get abs 1e-05 lt\n"
+"or{/flipXY 1 def}{/flipXY 0 def}ifelse}ifelse/erosion 1 def systemdict\n"
+"/internaldict known{1183615869 systemdict/internaldict get exec dup/erosion\n"
+"known{/erosion get/erosion exch def}{pop}ifelse}if yflag{flipXY 0 eq c3y2 c4y2\n"
+"eq or{false PickCoords}{/shrink c3y2 c4y2 eq{0}{c1y2 c4y2 sub c3y2 c4y2 sub\n"
+"div abs}ifelse def/yshrink{c4y2 sub shrink mul c4y2 add}def/c1y0 c3y0 yshrink\n"
+"def/c1y1 c3y1 yshrink def/c2y0 c4y0 yshrink def/c2y1 c4y1 yshrink def/c1x0\n"
+"c3x0 def/c1x1 c3x1 def/c2x0 c4x0 def/c2x1 c4x1 def/dY 0 c3y2 c1y2 sub round\n"
+"dtransform flipXY 1 eq{exch}if pop abs def dY dmin lt PickCoords y2 c1y2 sub\n"
+"abs .001 gt{c1x2 c1y2 transform flipXY 1 eq{exch}if/cx exch def/cy exch def/dY\n"
+"0 y2 c1y2 sub round dtransform flipXY 1 eq{exch}if pop def dY round dup 0 ne{\n"
+"/dY exdef}{pop dY 0 lt{-1}{1}ifelse/dY exdef}ifelse/erode PaintType 2 ne\n"
+"erosion .5 ge and def erode{/cy cy .5 sub def}if/ey cy dY add def/ey ey\n"
+"ceiling ey sub ey floor add def erode{/ey ey .5 add def}if ey cx flipXY 1 eq{\n"
+"exch}if itransform exch pop y2 sub/eShift exch def/y1 y1 eShift add def/y2 y2\n"
+"eShift add def/y3 y3 eShift add def}if}ifelse}{flipXY 0 eq c3x2 c4x2 eq or{\n"
+"false PickCoords}{/shrink c3x2 c4x2 eq{0}{c1x2 c4x2 sub c3x2 c4x2 sub div abs}\n"
+"ifelse def/xshrink{c4x2 sub shrink mul c4x2 add}def/c1x0 c3x0 xshrink def/c1x1\n"
+"c3x1 xshrink def/c2x0 c4x0 xshrink def/c2x1 c4x1 xshrink def/c1y0 c3y0 def\n"
+"/c1y1 c3y1 def/c2y0 c4y0 def/c2y1 c4y1 def/dX c3x2 c1x2 sub round 0 dtransform\n"
+"flipXY -1 eq{exch}if pop abs def dX dmin lt PickCoords x2 c1x2 sub abs .001 gt\n"
+"{c1x2 c1y2 transform flipXY -1 eq{exch}if/cy exch def/cx exch def/dX x2 c1x2\n"
+"sub round 0 dtransform flipXY -1 eq{exch}if pop def dX round dup 0 ne{/dX\n"
+"exdef}{pop dX 0 lt{-1}{1}ifelse/dX exdef}ifelse/erode PaintType 2 ne erosion\n"
+".5 ge and def erode{/cx cx .5 sub def}if/ex cx dX add def/ex ex ceiling ex sub\n"
+"ex floor add def erode{/ex ex .5 add def}if ex cy flipXY -1 eq{exch}if\n"
+"itransform pop x2 sub/eShift exch def/x1 x1 eShift add def/x2 x2 eShift add\n"
+"def/x3 x3 eShift add def}if}ifelse}ifelse x2 x5 eq y2 y5 eq or{x5 y5 lineto}{\n"
+"x0 y0 x1 y1 x2 y2 curveto x3 y3 x4 y4 x5 y5 curveto}ifelse epY epX}systemdict\n"
+"/currentpacking known{exch setpacking}if/exec cvx/end cvx]cvx executeonly exch\n"
+"{pop true exch restore}{systemdict/internaldict known not{1183615869 userdict\n"
+"/internaldict get exec exch/FlxProc exch put true}{1183615869 systemdict\n"
+"/internaldict get exec dup length exch maxlength eq{false}{1183615869\n"
+"systemdict/internaldict get exec exch/FlxProc exch put true}ifelse}ifelse}\n"
+"ifelse{systemdict/internaldict known{{1183615869 systemdict/internaldict get\n"
+"exec/FlxProc get exec}}{{1183615869 userdict/internaldict get exec/FlxProc get\n"
+"exec}}ifelse executeonly}if{gsave currentpoint newpath moveto}executeonly{\n"
+"currentpoint grestore gsave currentpoint newpath moveto}executeonly{systemdict\n"
+"/internaldict known not{pop 3}{1183615869 systemdict/internaldict get exec dup\n"
+"/startlock known{/startlock get exec}{dup/strtlck known{/strtlck get exec}{pop\n"
+"3}ifelse}ifelse}ifelse}executeonly]def";
+
+#else
+
+static const char* othersubrs_code = "/OtherSubrs\n"
"[\n"
-"systemdict /internaldict known not\n"
-"{ 100 dict /begin cvx /mtx matrix /def cvx } if\n"
-"systemdict /currentpacking known {currentpacking true setpacking} if\n"
-"{\n"
-"systemdict /internaldict known {\n"
-"1183615869 systemdict /internaldict get exec\n"
-"dup /$FlxDict known not {\n"
-"dup dup length exch maxlength eq\n"
-"{ pop userdict dup /$FlxDict known not\n"
-"{ 100 dict begin /mtx matrix def\n"
-"\n"
-"dup /$FlxDict currentdict put end } if }\n"
-"{ 100 dict begin /mtx matrix def\n"
-"dup /$FlxDict currentdict put end }\n"
-"ifelse\n"
-"} if\n"
-"/$FlxDict get begin\n"
-"} if\n"
-"grestore\n"
-"/exdef {exch def} def\n"
-"/dmin exch abs 100 div def\n"
-"/epX exdef /epY exdef\n"
-"/c4y2 exdef /c4x2 exdef /c4y1 exdef /c4x1 exdef /c4y0 exdef /c4x0 exdef\n"
-"/c3y2 exdef /c3x2 exdef /c3y1 exdef /c3x1 exdef /c3y0 exdef /c3x0 exdef\n"
-"/c1y2 exdef /c1x2 exdef /c2x2 c4x2 def /c2y2 c4y2 def\n"
-"/yflag c1y2 c3y2 sub abs c1x2 c3x2 sub abs gt def\n"
-"/PickCoords {\n"
-"{c1x0 c1y0 c1x1 c1y1 c1x2 c1y2 c2x0 c2y0 c2x1 c2y1 c2x2 c2y2 }\n"
-"{c3x0 c3y0 c3x1 c3y1 c3x2 c3y2 c4x0 c4y0 c4x1 c4y1 c4x2 c4y2 }\n"
-"ifelse\n"
-"/y5 exdef /x5 exdef /y4 exdef /x4 exdef /y3 exdef /x3 exdef\n"
-"/y2 exdef /x2 exdef /y1 exdef /x1 exdef /y0 exdef /x0 exdef\n"
-"} def\n"
-"mtx currentmatrix pop\n"
-"mtx 0 get abs .00001 lt mtx 3 get abs .00001 lt or\n"
-"{/flipXY -1 def }\n"
-"{mtx 1 get abs .00001 lt mtx 2 get abs .00001 lt or\n"
-"{/flipXY 1 def }\n"
-"{/flipXY 0 def }\n"
-"ifelse }\n"
-"ifelse\n"
-"/erosion 1 def\n"
-"systemdict /internaldict known {\n"
-"1183615869 systemdict /internaldict get exec dup\n"
-"/erosion known\n"
-"{/erosion get /erosion exch def}\n"
-"{pop}\n"
-"ifelse\n"
-"} if\n"
-"yflag\n"
-"{flipXY 0 eq c3y2 c4y2 eq or\n"
-"{false PickCoords }\n"
-"{/shrink c3y2 c4y2 eq\n"
-"{0}{c1y2 c4y2 sub c3y2 c4y2 sub div abs} ifelse def\n"
-"/yshrink {c4y2 sub shrink mul c4y2 add} def\n"
-"/c1y0 c3y0 yshrink def /c1y1 c3y1 yshrink def\n"
-"/c2y0 c4y0 yshrink def /c2y1 c4y1 yshrink def\n"
-"/c1x0 c3x0 def /c1x1 c3x1 def /c2x0 c4x0 def /c2x1 c4x1 def\n"
-"/dY 0 c3y2 c1y2 sub round\n"
-"dtransform flipXY 1 eq {exch} if pop abs def\n"
-"dY dmin lt PickCoords\n"
-"y2 c1y2 sub abs 0.001 gt {\n"
-"c1x2 c1y2 transform flipXY 1 eq {exch} if\n"
-"/cx exch def /cy exch def\n"
-"/dY 0 y2 c1y2 sub round dtransform flipXY 1 eq {exch}\n"
-"if pop def\n"
-"dY round dup 0 ne\n"
-"{/dY exdef }\n"
-"{pop dY 0 lt {-1}{1} ifelse /dY exdef }\n"
-"ifelse\n"
-"/erode PaintType 2 ne erosion 0.5 ge and def\n"
-"erode {/cy cy 0.5 sub def} if\n"
-"/ey cy dY add def\n"
-"/ey ey ceiling ey sub ey floor add def\n"
-"erode {/ey ey 0.5 add def} if\n"
-"ey cx flipXY 1 eq {exch} if itransform exch pop\n"
-"y2 sub /eShift exch def\n"
-"/y1 y1 eShift add def /y2 y2 eShift add def /y3 y3\n"
-"eShift add def\n"
-"} if\n"
-"} ifelse\n"
-"}\n"
-"{flipXY 0 eq c3x2 c4x2 eq or\n"
-"{false PickCoords }\n"
-"{/shrink c3x2 c4x2 eq\n"
-"{0}{c1x2 c4x2 sub c3x2 c4x2 sub div abs} ifelse def\n"
-"/xshrink {c4x2 sub shrink mul c4x2 add} def\n"
-"/c1x0 c3x0 xshrink def /c1x1 c3x1 xshrink def\n"
-"/c2x0 c4x0 xshrink def /c2x1 c4x1 xshrink def\n"
-"/c1y0 c3y0 def /c1y1 c3y1 def /c2y0 c4y0 def /c2y1 c4y1 def\n"
-"/dX c3x2 c1x2 sub round 0 dtransform\n"
-"flipXY -1 eq {exch} if pop abs def\n"
-"dX dmin lt PickCoords\n"
-"x2 c1x2 sub abs 0.001 gt {\n"
-"c1x2 c1y2 transform flipXY -1 eq {exch} if\n"
-"/cy exch def /cx exch def\n"
-"/dX x2 c1x2 sub round 0 dtransform flipXY -1 eq {exch} if pop def\n"
-"dX round dup 0 ne\n"
-"{/dX exdef }\n"
-"{pop dX 0 lt {-1}{1} ifelse /dX exdef }\n"
-"ifelse\n"
-"/erode PaintType 2 ne erosion .5 ge and def\n"
-"erode {/cx cx .5 sub def} if\n"
-"/ex cx dX add def\n"
-"/ex ex ceiling ex sub ex floor add def\n"
-"erode {/ex ex .5 add def} if\n"
-"ex cy flipXY -1 eq {exch} if itransform pop\n"
-"x2 sub /eShift exch def\n"
-"/x1 x1 eShift add def /x2 x2 eShift add def /x3 x3 eShift add def\n"
-"} if\n"
-"} ifelse\n"
-"} ifelse\n"
-"x2 x5 eq y2 y5 eq or\n"
-"{ x5 y5 lineto }\n"
-"{ x0 y0 x1 y1 x2 y2 curveto\n"
-"x3 y3 x4 y4 x5 y5 curveto }\n"
-"ifelse\n"
-"epY epX\n"
-"}\n"
-"systemdict /currentpacking known {exch setpacking} if\n"
-"/exec cvx /end cvx ] cvx\n"
-"executeonly\n"
-"exch\n"
-"{pop true exch restore}\n"
-"{\n"
-"systemdict /internaldict known not\n"
-"{1183615869 userdict /internaldict get exec\n"
-"exch /FlxProc exch put true}\n"
-"{1183615869 systemdict /internaldict get exec\n"
-"dup length exch maxlength eq\n"
-"{false}\n"
-"{1183615869 systemdict /internaldict get exec\n"
-"exch /FlxProc exch put true}\n"
-"ifelse}\n"
-"ifelse}\n"
-"ifelse\n"
-"{systemdict /internaldict known\n"
-"{{1183615869 systemdict /internaldict get exec /FlxProc get exec}}\n"
-"{{1183615869 userdict /internaldict get exec /FlxProc get exec}}\n"
-"ifelse executeonly\n"
-"} if\n"
+"{pop pop pop grestore 12 6 roll curveto curveto pop pop} executeonly\n"
"{gsave currentpoint newpath moveto} executeonly\n"
-"{currentpoint grestore gsave currentpoint newpath moveto}\n"
-"executeonly\n"
-"{systemdict /internaldict known not\n"
-"{pop 3}\n"
-"{1183615869 systemdict /internaldict get exec\n"
-"dup /startlock known\n"
-"{/startlock get exec}\n"
-"{dup /strtlck known\n"
-"{/strtlck get exec}\n"
-"{pop 3}\n"
-"ifelse}\n"
-"ifelse}\n"
-"ifelse\n"
-"} executeonly\n"
+"{currentpoint currentpoint newpath moveto} executeonly\n"
+"{} executeonly\n"
"] noaccess def";
+#endif
+
Type1Font *
Type1Font::skeleton_make(PermString font_name, const String &version)
{
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1interp.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1interp.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1interp.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* t1interp.{cc,hh} -- Type 1/2 charstring interpretation
*
- * Copyright (c) 1998-2014 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1item.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1item.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1item.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* t1item.{cc,hh} -- items in a Type 1 font
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1mm.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1mm.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1mm.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* t1mm.{cc,hh} -- Type 1 multiple master font information
*
- * Copyright (c) 1998-2014 Eddie Kohler
+ * Copyright (c) 1998-2016 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
@@ -98,7 +98,7 @@
assert(strlen(s) < 800);
sprintf(buf, (s[0] == ' ' ? "%.200s%s" : "%.200s: %s"),
_font_name.c_str(), s);
- errh->vxmessage(ErrorHandler::e_error, buf, val);
+ errh->xmessage(ErrorHandler::e_error, buf, val);
va_end(val);
}
return false;
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1rw.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1rw.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1rw.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* t1rw.{cc,hh} -- Type 1 font reading and writing
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1unparser.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1unparser.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/t1unparser.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* t1unparser.{cc,hh} -- debug printing of Type 1 fonts
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfcs.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfcs.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfcs.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* ttfcs.{cc,hh} -- TrueType "charstring" emulation
*
- * Copyright (c) 2006-2014 Eddie Kohler
+ * Copyright (c) 2006-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfhead.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfhead.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfhead.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* ttfhead.{cc,hh} -- TrueType head table
*
- * Copyright (c) 2007-2012 Eddie Kohler
+ * Copyright (c) 2007-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfkern.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfkern.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/ttfkern.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* ttfkern.{cc,hh} -- TrueType kern table
*
- * Copyright (c) 2009-2012 Eddie Kohler
+ * Copyright (c) 2009-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
@FIXLIBC_TRUE at am__append_1 = fixlibc.c
-subdir = lcdf-typetools-src/liblcdf
+subdir = liblcdf
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -111,6 +99,7 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
ARFLAGS = cru
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
@@ -143,27 +132,17 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
@@ -170,17 +149,13 @@
am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -211,14 +186,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -232,19 +204,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -254,27 +221,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -283,9 +238,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -292,16 +245,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -308,11 +257,7 @@
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@
@@ -321,11 +266,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -361,7 +302,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .cc .lo .o .obj
+.SUFFIXES: .c .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -371,9 +312,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/liblcdf/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liblcdf/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/liblcdf/Makefile
+ $(AUTOMAKE) --foreign liblcdf/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -424,59 +365,33 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vectorv.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-.c.lo:
- at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
@@ -596,8 +511,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
- mostlyclean-am
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -652,8 +566,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -668,18 +581,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am 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-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ 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-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 tags-am uninstall uninstall-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/bezier.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/bezier.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/bezier.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* bezier.{cc,hh} -- cubic Bezier curves
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/clp.c
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/clp.c 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/clp.c 2016-06-22 06:25:09 UTC (rev 41518)
@@ -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-2013 Eddie Kohler, ekohler at gmail.com
+ * Copyright (c) 1997-2016 Eddie Kohler, ekohler at gmail.com
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/error.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/error.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/error.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -4,7 +4,7 @@
* Eddie Kohler
*
* Copyright (c) 1999-2000 Massachusetts Institute of Technology
- * Copyright (c) 2001-2013 Eddie Kohler
+ * Copyright (c) 2001-2016 Eddie Kohler
* Copyright (c) 2008 Meraki, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -464,6 +464,7 @@
s++;
goto width_flags;
case 'z':
+ case 't':
if (width_flag)
break;
width_flag = *s++;
@@ -616,6 +617,9 @@
#if SIZEOF_SIZE_T == 4
case 'z':
#endif
+#if SIZEOF_PTRDIFF_T == 4
+ case 't':
+#endif
num = va_arg(val, unsigned);
if ((flags & cf_signed) && (int) num < 0)
num = -(int) num, flags |= cf_negative;
@@ -630,6 +634,9 @@
# if SIZEOF_SIZE_T == 8
case 'z':
# endif
+# if SIZEOF_PTRDIFF_T == 8
+ case 't':
+# endif
case -64: {
uint64_t qnum = va_arg(val, uint64_t);
if ((flags & cf_signed) && (int64_t)qnum < 0)
@@ -674,7 +681,7 @@
}
void* v = va_arg(val, void*);
s2 = numbuf + NUMBUF_SIZE;
- s1 = do_number((uintptr_t) v, (char*) s2, 16, flags);
+ s1 = do_number((unsigned long) v, (char*) s2, 16, flags);
s1 = do_number_flags((char*) s1, (char*) s2, 16, flags | cf_alternate_form, precision, field_width);
break;
}
@@ -783,7 +790,7 @@
{
va_list val;
va_start(val, fmt);
- vxmessage(String::make_stable(e_debug, 3), fmt, val);
+ xmessage(String::make_stable(e_debug, 3), fmt, val);
va_end(val);
}
@@ -792,7 +799,7 @@
{
va_list val;
va_start(val, fmt);
- vxmessage(String::make_stable(e_info, 3), fmt, val);
+ xmessage(String::make_stable(e_info, 3), fmt, val);
va_end(val);
}
@@ -801,7 +808,7 @@
{
va_list val;
va_start(val, fmt);
- int r = vxmessage(String::make_stable(e_warning_annotated, 12), fmt, val);
+ int r = xmessage(String::make_stable(e_warning_annotated, 12), fmt, val);
va_end(val);
return r;
}
@@ -811,7 +818,7 @@
{
va_list val;
va_start(val, fmt);
- int r = vxmessage(String::make_stable(e_error, 3), fmt, val);
+ int r = xmessage(String::make_stable(e_error, 3), fmt, val);
va_end(val);
return r;
}
@@ -821,7 +828,7 @@
{
va_list val;
va_start(val, fmt);
- int r = vxmessage(String::make_stable(e_fatal, 4), fmt, val);
+ int r = xmessage(String::make_stable(e_fatal, 4), fmt, val);
va_end(val);
abort();
}
@@ -832,7 +839,7 @@
va_list val;
va_start(val, fmt);
String l = make_landmark_anno(landmark);
- vxmessage(String::make_stable(e_debug, 3) + l, fmt, val);
+ xmessage(String::make_stable(e_debug, 3) + l, fmt, val);
va_end(val);
}
@@ -842,7 +849,7 @@
va_list val;
va_start(val, fmt);
String l = make_landmark_anno(landmark);
- vxmessage(String::make_stable(e_info, 3) + l, fmt, val);
+ xmessage(String::make_stable(e_info, 3) + l, fmt, val);
va_end(val);
}
@@ -852,7 +859,7 @@
va_list val;
va_start(val, fmt);
String l = make_landmark_anno(landmark);
- int r = vxmessage(l + String::make_stable(e_warning_annotated, 12), fmt, val);
+ int r = xmessage(l + String::make_stable(e_warning_annotated, 12), fmt, val);
va_end(val);
return r;
}
@@ -863,7 +870,7 @@
va_list val;
va_start(val, fmt);
String l = make_landmark_anno(landmark);
- int r = vxmessage(String::make_stable(e_error, 3) + l, fmt, val);
+ int r = xmessage(String::make_stable(e_error, 3) + l, fmt, val);
va_end(val);
return r;
}
@@ -874,7 +881,7 @@
va_list val;
va_start(val, fmt);
String l = make_landmark_anno(landmark);
- int r = vxmessage(String::make_stable(e_fatal, 4) + l, fmt, val);
+ int r = xmessage(String::make_stable(e_fatal, 4) + l, fmt, val);
va_end(val);
abort();
}
@@ -1084,7 +1091,7 @@
ContextErrorHandler::ContextErrorHandler(ErrorHandler *errh, const char *fmt,
...)
: ErrorVeneer(errh), _indent(String::make_stable(" ", 2)),
- _context_printed(false)
+ _context_printed(false), _context_landmark("{l:}")
{
va_list val;
va_start(val, fmt);
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/filename.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/filename.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/filename.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* filename.{cc,hh} -- filenames
*
- * Copyright (c) 1999-2012 Eddie Kohler
+ * Copyright (c) 1999-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/globmatch.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/globmatch.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/globmatch.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* globmatch.{cc,hh} -- glob_match() function for shell globbing
*
- * Copyright (c) 2000-2012 Eddie Kohler
+ * Copyright (c) 2000-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/landmark.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/landmark.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/landmark.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* landmark.{cc,hh} -- FILE:LINE type landmarks
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/permstr.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/permstr.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/permstr.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* permstr.{cc,hh} -- permanent strings
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/point.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/point.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/point.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* point.{cc,hh} -- 2D points
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/slurper.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/slurper.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/slurper.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* slurper.{cc,hh} -- reading from files a line at a time
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/straccum.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/straccum.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/straccum.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -4,7 +4,7 @@
* Eddie Kohler
*
* Copyright (c) 1999-2000 Massachusetts Institute of Technology
- * Copyright (c) 2001-2012 Eddie Kohler
+ * Copyright (c) 2001-2016 Eddie Kohler
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/string.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/string.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/string.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -4,7 +4,7 @@
* Eddie Kohler
*
* Copyright (c) 1999-2000 Massachusetts Institute of Technology
- * Copyright (c) 2001-2012 Eddie Kohler
+ * Copyright (c) 2001-2016 Eddie Kohler
* Copyright (c) 2008-2009 Meraki, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/transform.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/transform.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/transform.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -2,7 +2,7 @@
/* transform.{cc,hh} -- planar affine transformations
*
- * Copyright (c) 2000-2014 Eddie Kohler
+ * Copyright (c) 2000-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = mmafm$(EXEEXT)
-subdir = lcdf-typetools-src/mmafm
+subdir = mmafm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -115,10 +103,6 @@
am_mmafm_OBJECTS = main.$(OBJEXT)
mmafm_OBJECTS = $(am_mmafm_OBJECTS)
mmafm_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -132,22 +116,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -208,14 +188,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -229,19 +206,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -251,27 +223,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -280,9 +240,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -289,16 +247,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -305,11 +259,7 @@
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@
@@ -318,11 +268,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -356,7 +302,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -366,9 +312,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/mmafm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mmafm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/mmafm/Makefile
+ $(AUTOMAKE) --foreign mmafm/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -396,7 +342,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -411,8 +356,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -428,13 +373,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
mmafm$(EXEEXT): $(mmafm_OBJECTS) $(mmafm_DEPENDENCIES) $(EXTRA_mmafm_DEPENDENCIES)
@rm -f mmafm$(EXEEXT)
@@ -449,34 +388,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -643,7 +566,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -698,8 +621,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -716,18 +638,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/main.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/main.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/main.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* main.cc -- driver for mmafm program
*
- * Copyright (c) 1997-2013 Eddie Kohler
+ * Copyright (c) 1997-2016 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
@@ -213,7 +213,7 @@
if (!error_message)
errh->message("Usage: %s [OPTION | FONT]...", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -322,7 +322,7 @@
case VERSION_OPT:
printf("mmafm (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1997-2013 Eddie Kohler\n\
+ printf("Copyright (C) 1997-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/mmafm.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/mmafm.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/mmafm.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = mmpfb$(EXEEXT)
-subdir = lcdf-typetools-src/mmpfb
+subdir = mmpfb
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -116,10 +104,6 @@
t1minimize.$(OBJEXT) t1rewrit.$(OBJEXT)
mmpfb_OBJECTS = $(am_mmpfb_OBJECTS)
mmpfb_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -133,22 +117,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -155,18 +135,12 @@
am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
@@ -227,14 +201,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -248,19 +219,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -270,27 +236,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -299,9 +253,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -308,16 +260,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -324,11 +272,7 @@
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@
@@ -337,11 +281,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -379,7 +319,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -389,9 +329,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/mmpfb/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mmpfb/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/mmpfb/Makefile
+ $(AUTOMAKE) --foreign mmpfb/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -419,7 +359,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -434,8 +373,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -451,13 +390,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
mmpfb$(EXEEXT): $(mmpfb_OBJECTS) $(mmpfb_DEPENDENCIES) $(EXTRA_mmpfb_DEPENDENCIES)
@rm -f mmpfb$(EXEEXT)
@@ -475,34 +408,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t1rewrit.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -669,7 +586,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -724,8 +641,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -742,18 +658,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/main.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/main.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/main.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* main.cc -- driver for mmpfb program
*
- * Copyright (c) 1997-2013 Eddie Kohler
+ * Copyright (c) 1997-2016 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
@@ -98,7 +98,7 @@
if (!error_message)
errh->message("Usage: %s [OPTION]... FONT", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -355,7 +355,7 @@
case VERSION_OPT:
printf("mmpfb (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1997-2013 Eddie Kohler\n\
+ printf("Copyright (C) 1997-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/mmpfb.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/mmpfb.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/mmpfb.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/myfont.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/myfont.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/myfont.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* myfont.cc -- general multiple- to single-master conversion
*
- * Copyright (c) 1997-2012 Eddie Kohler
+ * Copyright (c) 1997-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/t1minimize.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/t1minimize.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/t1minimize.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* t1minimize.cc -- make minimal copy of a Type 1 font
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/t1rewrit.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/t1rewrit.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/t1rewrit.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* t1rewrit.cc -- routines for multiple- to single-master charstring conversion
*
- * Copyright (c) 1997-2012 Eddie Kohler
+ * Copyright (c) 1997-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = otfinfo$(EXEEXT)
-subdir = lcdf-typetools-src/otfinfo
+subdir = otfinfo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -114,10 +102,6 @@
PROGRAMS = $(bin_PROGRAMS)
am_otfinfo_OBJECTS = otfinfo.$(OBJEXT)
otfinfo_OBJECTS = $(am_otfinfo_OBJECTS)
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -131,22 +115,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -207,14 +187,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -228,19 +205,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -250,27 +222,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -279,9 +239,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -288,16 +246,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -304,11 +258,7 @@
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@
@@ -317,11 +267,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -358,7 +304,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -368,9 +314,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/otfinfo/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign otfinfo/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/otfinfo/Makefile
+ $(AUTOMAKE) --foreign otfinfo/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -398,7 +344,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -413,8 +358,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -430,13 +375,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
otfinfo$(EXEEXT): $(otfinfo_OBJECTS) $(otfinfo_DEPENDENCIES) $(EXTRA_otfinfo_DEPENDENCIES)
@rm -f otfinfo$(EXEEXT)
@@ -451,34 +390,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/otfinfo.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -645,7 +568,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -700,8 +623,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -718,18 +640,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/otfinfo.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/otfinfo.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/otfinfo.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/otfinfo.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/otfinfo.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/otfinfo.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* otfinfo.cc -- driver for reporting information about OpenType fonts
*
- * Copyright (c) 2003-2014 Eddie Kohler
+ * Copyright (c) 2003-2016 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
@@ -98,7 +98,7 @@
if (!error_message)
errh->message("Usage: %s [OPTION]... FONT", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -645,7 +645,7 @@
case VERSION_OPT:
printf("otfinfo (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2003-2013 Eddie Kohler\n\
+ printf("Copyright (C) 2003-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,27 +86,15 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = otftotfm$(EXEEXT)
@have_kpathsea_TRUE at am__append_1 = kpseinterface.c kpseinterface.h
@have_kpathsea_TRUE at am__append_2 = $(KPATHSEA_INCLUDES)
@have_kpathsea_TRUE at am__append_3 = $(KPATHSEA_LIBS)
@have_kpathsea_TRUE at am__append_4 = $(KPATHSEA_DEPEND)
-subdir = lcdf-typetools-src/otftotfm
+subdir = otftotfm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -129,10 +117,6 @@
otftotfm_OBJECTS = $(am_otftotfm_OBJECTS)
am__DEPENDENCIES_1 =
@have_kpathsea_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -146,23 +130,17 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
@@ -169,17 +147,13 @@
am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -240,14 +214,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -261,19 +232,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -283,27 +249,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -312,9 +266,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -321,16 +273,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -337,11 +285,7 @@
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@
@@ -350,11 +294,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -395,7 +335,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .cc .lo .o .obj
+.SUFFIXES: .c .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -405,9 +345,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/otftotfm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign otftotfm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/otftotfm/Makefile
+ $(AUTOMAKE) --foreign otftotfm/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -435,7 +375,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -450,8 +389,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -467,13 +406,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
otftotfm$(EXEEXT): $(otftotfm_OBJECTS) $(otftotfm_DEPENDENCIES) $(EXTRA_otftotfm_DEPENDENCIES)
@rm -f otftotfm$(EXEEXT)
@@ -496,58 +429,32 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/util.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-.c.lo:
- at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -714,7 +621,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -769,8 +676,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -787,18 +693,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/automatic.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/automatic.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/automatic.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* automatic.{cc,hh} -- code for automatic mode and interfacing with kpathsea
*
- * Copyright (c) 2003-2014 Eddie Kohler
+ * Copyright (c) 2003-2016 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
@@ -336,7 +336,7 @@
if (!success && writable_texdir.find_left('\'') < 0 && directory.find_left('\'') < 0 && file.find_left('\'') < 0) {
// look for mktexupd script
if (!mktexupd_tried) {
-#ifdef WIN32
+#ifdef _WIN32
mktexupd = "mktexupd";
#else
mktexupd = kpsei_string(kpsei_find_file("mktexupd", KPSEI_FMT_WEB2C));
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/dvipsencoding.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/dvipsencoding.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/dvipsencoding.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* dvipsencoding.{cc,hh} -- store a DVIPS encoding
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/glyphfilter.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/glyphfilter.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/glyphfilter.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* glyphfilter.{cc,hh} -- define subsets of characters
*
- * Copyright (c) 2004-2012 Eddie Kohler
+ * Copyright (c) 2004-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/kpseinterface.c
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/kpseinterface.c 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/kpseinterface.c 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* kpseinterface.{c,h} -- interface with the kpathsea library
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/metrics.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/metrics.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/metrics.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* metrics.{cc,hh} -- an encoding during and after OpenType features
*
- * Copyright (c) 2003-2014 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* otftotfm.cc -- driver for translating OpenType fonts to TeX metrics
*
- * Copyright (c) 2003-2014 Eddie Kohler
+ * Copyright (c) 2003-2016 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
@@ -305,7 +305,7 @@
if (!error_message)
errh->message("Usage: %s [OPTION]... FONT", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -716,9 +716,13 @@
if (i >= 256)
continue;
+ char* expected_name_end;
if (expected_name
- && name.length() >= expected_name.length()
- && memcmp(name.c_str(), expected_name.c_str(), expected_name.length()) == 0)
+ && (name == expected_name
+ || (name.length() == 7
+ && memcmp(name.data(), "uni00", 5) == 0
+ && strtol(name.c_str() + 3, &expected_name_end, 16) == i
+ && *expected_name_end == 0)))
glyph_ids.push_back("C " + String((char)i));
else
glyph_ids.push_back("D " + String(i));
@@ -2171,7 +2175,7 @@
case VERSION_OPT:
printf("otftotfm (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2002-2014 Eddie Kohler\n\
+ printf("Copyright (C) 2002-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/secondary.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/secondary.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/secondary.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* secondary.{cc,hh} -- code for generating fake glyphs
*
- * Copyright (c) 2003-2014 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/uniprop.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/uniprop.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/uniprop.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* uniprop.{cc,hh} -- code for Unicode character properties
*
- * Copyright (c) 2004-2012 Eddie Kohler
+ * Copyright (c) 2004-2016 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
@@ -17,83 +17,112 @@
const unsigned char UnicodeProperty::property_pages[] = {
0, P_Cn,
- 0, P_Cc, 32, P_Zs, 33, P_Po, 36, P_Sc, 37, P_Po, 40, P_Ps, 41, P_Pe, 42, P_Po, 43, P_Sm, 44, P_Po, 45, P_Pd, 46, P_Po, 48, P_Nd, 58, P_Po, 60, P_Sm, 63, P_Po, 65, P_Lu, 91, P_Ps, 92, P_Po, 93, P_Pe, 94, P_Sk, 95, P_Pc, 96, P_Sk, 97, P_Ll, 123, P_Ps, 124, P_Sm, 125, P_Pe, 126, P_Sm, 127, P_Cc, 160, P_Zs, 161, P_Po, 162, P_Sc, 166, P_So, 168, P_Sk, 169, P_So, 170, P_Ll, 171, P_Pi, 172, P_Sm, 173, P_Cf, 174, P_So, 175, P_Sk, 176, P_So, 177, P_Sm, 178, P_No, 180, P_Sk, 181, P_Ll, 182, P_So, 183, P_Po, 184, P_Sk, 185, P_No, 186, P_Ll, 187, P_Pf, 188, P_No, 191, P_Po, 192, P_Lu, 215, P_Sm, 216, P_Lu, 223, P_Ll, 247, P_Sm, 248, P_Ll,
+ 0, P_Cc, 32, P_Zs, 33, P_Po, 36, P_Sc, 37, P_Po, 40, P_Ps, 41, P_Pe, 42, P_Po, 43, P_Sm, 44, P_Po, 45, P_Pd, 46, P_Po, 48, P_Nd, 58, P_Po, 60, P_Sm, 63, P_Po, 65, P_Lu, 91, P_Ps, 92, P_Po, 93, P_Pe, 94, P_Sk, 95, P_Pc, 96, P_Sk, 97, P_Ll, 123, P_Ps, 124, P_Sm, 125, P_Pe, 126, P_Sm, 127, P_Cc, 160, P_Zs, 161, P_Po, 162, P_Sc, 166, P_So, 167, P_Po, 168, P_Sk, 169, P_So, 170, P_Lo, 171, P_Pi, 172, P_Sm, 173, P_Cf, 174, P_So, 175, P_Sk, 176, P_So, 177, P_Sm, 178, P_No, 180, P_Sk, 181, P_Ll, 182, P_Po, 184, P_Sk, 185, P_No, 186, P_Lo, 187, P_Pf, 188, P_No, 191, P_Po, 192, P_Lu, 215, P_Sm, 216, P_Lu, 223, P_Ll, 247, P_Sm, 248, P_Ll,
0, P_Lul, 56, P_Ll, 57, P_Lul, 73, P_Ll, 74, P_Lul, 120, P_Lu, 122, P_Ll, 123, P_Lul, 127, P_Ll, 129, P_Lu, 131, P_Ll, 132, P_Lul, 134, P_Lu, 136, P_Ll, 137, P_Lu, 140, P_Ll, 142, P_Lu, 146, P_Ll, 147, P_Lu, 149, P_Ll, 150, P_Lu, 153, P_Ll, 156, P_Lu, 158, P_Ll, 159, P_Lu, 161, P_Ll, 162, P_Lul, 166, P_Lu, 168, P_Ll, 169, P_Lul, 171, P_Ll, 172, P_Lul, 174, P_Lu, 176, P_Ll, 177, P_Lu, 180, P_Ll, 181, P_Lul, 183, P_Lu, 185, P_Ll, 187, P_Lo, 188, P_Lul, 190, P_Ll, 192, P_Lo, 196, P_Lu, 197, P_Lt, 198, P_Ll, 199, P_Lu, 200, P_Lt, 201, P_Ll, 202, P_Lu, 203, P_Lt, 204, P_Ll, 205, P_Lul, 221, P_Ll, 222, P_Lul, 240, P_Ll, 241, P_Lu, 242, P_Lt, 243, P_Ll, 244, P_Lul, 246, P_Lu, 249, P_Ll, 250, P_Lul,
- 0, P_Lul, 52, P_Ll, 58, P_Lu, 60, P_Ll, 61, P_Lu, 63, P_Ll, 65, P_Lul, 67, P_Lu, 71, P_Ll, 72, P_Lul, 80, P_Ll, 148, P_Lo, 149, P_Ll, 176, P_Lm, 194, P_Sk, 198, P_Lm, 210, P_Sk, 224, P_Lm, 229, P_Sk, 238, P_Lm, 239, P_Sk,
- 0, P_Mn, 112, P_Cn, 116, P_Sk, 118, P_Cn, 122, P_Lm, 123, P_Ll, 126, P_Po, 127, P_Cn, 132, P_Sk, 134, P_Lu, 135, P_Po, 136, P_Lu, 139, P_Cn, 140, P_Lu, 141, P_Cn, 142, P_Lu, 144, P_Ll, 145, P_Lu, 162, P_Cn, 163, P_Lu, 172, P_Ll, 207, P_Cn, 208, P_Ll, 210, P_Lu, 213, P_Ll, 216, P_Lul, 240, P_Ll, 244, P_Lul, 246, P_Sm, 247, P_Lul, 249, P_Lu, 251, P_Ll, 253, P_Lu,
- 0, P_Lu, 48, P_Ll, 96, P_Lul, 130, P_So, 131, P_Mn, 135, P_Cn, 136, P_Me, 138, P_Lul, 192, P_Lu, 194, P_Ll, 195, P_Lul, 207, P_Ll, 208, P_Lul,
- 0, P_Lul, 20, P_Cn, 49, P_Lu, 87, P_Cn, 89, P_Lm, 90, P_Po, 96, P_Cn, 97, P_Ll, 136, P_Cn, 137, P_Po, 138, P_Pd, 139, P_Cn, 145, P_Mn, 190, P_Po, 191, P_Mn, 192, P_Po, 193, P_Mn, 195, P_Po, 196, P_Mn, 198, P_Po, 199, P_Mn, 200, P_Cn, 208, P_Lo, 235, P_Cn, 240, P_Lo, 243, P_Po, 245, P_Cn,
- 0, P_Cf, 4, P_Cn, 11, P_Sc, 12, P_Po, 14, P_So, 16, P_Mn, 22, P_Cn, 27, P_Po, 28, P_Cn, 30, P_Po, 32, P_Cn, 33, P_Lo, 59, P_Cn, 64, P_Lm, 65, P_Lo, 75, P_Mn, 95, P_Cn, 96, P_Nd, 106, P_Po, 110, P_Lo, 112, P_Mn, 113, P_Lo, 212, P_Po, 213, P_Lo, 214, P_Mn, 221, P_Cf, 222, P_Me, 223, P_Mn, 229, P_Lm, 231, P_Mn, 233, P_So, 234, P_Mn, 238, P_Lo, 240, P_Nd, 250, P_Lo, 253, P_So, 255, P_Lo,
- 0, P_Po, 14, P_Cn, 15, P_Cf, 16, P_Lo, 17, P_Mn, 18, P_Lo, 48, P_Mn, 75, P_Cn, 77, P_Lo, 110, P_Cn, 128, P_Lo, 166, P_Mn, 177, P_Lo, 178, P_Cn, 192, P_Nd, 202, P_Lo, 235, P_Mn, 244, P_Lm, 246, P_So, 247, P_Po, 250, P_Lm, 251, P_Cn,
- 0, P_Cn, 1, P_Mn, 3, P_Mc, 4, P_Lo, 58, P_Cn, 60, P_Mn, 61, P_Lo, 62, P_Mc, 65, P_Mn, 73, P_Mc, 77, P_Mn, 78, P_Cn, 80, P_Lo, 81, P_Mn, 85, P_Cn, 88, P_Lo, 98, P_Mn, 100, P_Po, 102, P_Nd, 112, P_Po, 113, P_Cn, 123, P_Lo, 128, P_Cn, 129, P_Mn, 130, P_Mc, 132, P_Cn, 133, P_Lo, 141, P_Cn, 143, P_Lo, 145, P_Cn, 147, P_Lo, 169, P_Cn, 170, P_Lo, 177, P_Cn, 178, P_Lo, 179, P_Cn, 182, P_Lo, 186, P_Cn, 188, P_Mn, 189, P_Lo, 190, P_Mc, 193, P_Mn, 197, P_Cn, 199, P_Mc, 201, P_Cn, 203, P_Mc, 205, P_Mn, 206, P_Lo, 207, P_Cn, 215, P_Mc, 216, P_Cn, 220, P_Lo, 222, P_Cn, 223, P_Lo, 226, P_Mn, 228, P_Cn, 230, P_Nd, 240, P_Lo, 242, P_Sc, 244, P_No, 250, P_So, 251, P_Cn,
- 0, P_Cn, 1, P_Mn, 3, P_Mc, 4, P_Cn, 5, P_Lo, 11, P_Cn, 15, P_Lo, 17, P_Cn, 19, P_Lo, 41, P_Cn, 42, P_Lo, 49, P_Cn, 50, P_Lo, 52, P_Cn, 53, P_Lo, 55, P_Cn, 56, P_Lo, 58, P_Cn, 60, P_Mn, 61, P_Cn, 62, P_Mc, 65, P_Mn, 67, P_Cn, 71, P_Mn, 73, P_Cn, 75, P_Mn, 78, P_Cn, 89, P_Lo, 93, P_Cn, 94, P_Lo, 95, P_Cn, 102, P_Nd, 112, P_Mn, 114, P_Lo, 117, P_Cn, 129, P_Mn, 131, P_Mc, 132, P_Cn, 133, P_Lo, 142, P_Cn, 143, P_Lo, 146, P_Cn, 147, P_Lo, 169, P_Cn, 170, P_Lo, 177, P_Cn, 178, P_Lo, 180, P_Cn, 181, P_Lo, 186, P_Cn, 188, P_Mn, 189, P_Lo, 190, P_Mc, 193, P_Mn, 198, P_Cn, 199, P_Mn, 201, P_Mc, 202, P_Cn, 203, P_Mc, 205, P_Mn, 206, P_Cn, 208, P_Lo, 209, P_Cn, 224, P_Lo, 226, P_Mn, 228, P_Cn, 230, P_Nd, 240, P_Cn, 241, P_Sc, 242, P_Cn,
- 0, P_Cn, 1, P_Mn, 2, P_Mc, 4, P_Cn, 5, P_Lo, 13, P_Cn, 15, P_Lo, 17, P_Cn, 19, P_Lo, 41, P_Cn, 42, P_Lo, 49, P_Cn, 50, P_Lo, 52, P_Cn, 53, P_Lo, 58, P_Cn, 60, P_Mn, 61, P_Lo, 62, P_Mc, 63, P_Mn, 64, P_Mc, 65, P_Mn, 68, P_Cn, 71, P_Mc, 73, P_Cn, 75, P_Mc, 77, P_Mn, 78, P_Cn, 86, P_Mn, 87, P_Mc, 88, P_Cn, 92, P_Lo, 94, P_Cn, 95, P_Lo, 98, P_Cn, 102, P_Nd, 112, P_So, 113, P_Lo, 114, P_Cn, 130, P_Mn, 131, P_Lo, 132, P_Cn, 133, P_Lo, 139, P_Cn, 142, P_Lo, 145, P_Cn, 146, P_Lo, 150, P_Cn, 153, P_Lo, 155, P_Cn, 156, P_Lo, 157, P_Cn, 158, P_Lo, 160, P_Cn, 163, P_Lo, 165, P_Cn, 168, P_Lo, 171, P_Cn, 174, P_Lo, 186, P_Cn, 190, P_Mc, 192, P_Mn, 193, P_Mc, 195, P_Cn, 198, P_Mc, 201, P_Cn, 202, P_Mc, 205, P_Mn, 206, P_Cn, 215, P_Mc, 216, P_Cn, 230, P_Nd, 240, P_No, 243, P_So, 249, P_Sc, 250, P_So, 251, P_Cn,
- 0, P_Cn, 1, P_Mc, 4, P_Cn, 5, P_Lo, 13, P_Cn, 14, P_Lo, 17, P_Cn, 18, P_Lo, 41, P_Cn, 42, P_Lo, 52, P_Cn, 53, P_Lo, 58, P_Cn, 62, P_Mn, 65, P_Mc, 69, P_Cn, 70, P_Mn, 73, P_Cn, 74, P_Mn, 78, P_Cn, 85, P_Mn, 87, P_Cn, 96, P_Lo, 98, P_Cn, 102, P_Nd, 112, P_Cn, 130, P_Mc, 132, P_Cn, 133, P_Lo, 141, P_Cn, 142, P_Lo, 145, P_Cn, 146, P_Lo, 169, P_Cn, 170, P_Lo, 180, P_Cn, 181, P_Lo, 186, P_Cn, 188, P_Mn, 189, P_Lo, 190, P_Mc, 191, P_Mn, 192, P_Mc, 197, P_Cn, 198, P_Mn, 199, P_Mc, 201, P_Cn, 202, P_Mc, 204, P_Mn, 206, P_Cn, 213, P_Mc, 215, P_Cn, 222, P_Lo, 223, P_Cn, 224, P_Lo, 226, P_Mn, 228, P_Cn, 230, P_Nd, 240, P_Cn, 241, P_So, 243, P_Cn,
- 0, P_Cn, 2, P_Mc, 4, P_Cn, 5, P_Lo, 13, P_Cn, 14, P_Lo, 17, P_Cn, 18, P_Lo, 41, P_Cn, 42, P_Lo, 58, P_Cn, 62, P_Mc, 65, P_Mn, 68, P_Cn, 70, P_Mc, 73, P_Cn, 74, P_Mc, 77, P_Mn, 78, P_Cn, 87, P_Mc, 88, P_Cn, 96, P_Lo, 98, P_Cn, 102, P_Nd, 112, P_Cn, 130, P_Mc, 132, P_Cn, 133, P_Lo, 151, P_Cn, 154, P_Lo, 178, P_Cn, 179, P_Lo, 188, P_Cn, 189, P_Lo, 190, P_Cn, 192, P_Lo, 199, P_Cn, 202, P_Mn, 203, P_Cn, 207, P_Mc, 210, P_Mn, 213, P_Cn, 214, P_Mn, 215, P_Cn, 216, P_Mc, 224, P_Cn, 242, P_Mc, 244, P_Po, 245, P_Cn,
- 0, P_Cn, 1, P_Lo, 49, P_Mn, 50, P_Lo, 52, P_Mn, 59, P_Cn, 63, P_Sc, 64, P_Lo, 70, P_Lm, 71, P_Mn, 79, P_Po, 80, P_Nd, 90, P_Po, 92, P_Cn, 129, P_Lo, 131, P_Cn, 132, P_Lo, 133, P_Cn, 135, P_Lo, 137, P_Cn, 138, P_Lo, 139, P_Cn, 141, P_Lo, 142, P_Cn, 148, P_Lo, 152, P_Cn, 153, P_Lo, 160, P_Cn, 161, P_Lo, 164, P_Cn, 165, P_Lo, 166, P_Cn, 167, P_Lo, 168, P_Cn, 170, P_Lo, 172, P_Cn, 173, P_Lo, 177, P_Mn, 178, P_Lo, 180, P_Mn, 186, P_Cn, 187, P_Mn, 189, P_Lo, 190, P_Cn, 192, P_Lo, 197, P_Cn, 198, P_Lm, 199, P_Cn, 200, P_Mn, 206, P_Cn, 208, P_Nd, 218, P_Cn, 220, P_Lo, 222, P_Cn,
- 0, P_Lo, 1, P_So, 4, P_Po, 19, P_So, 24, P_Mn, 26, P_So, 32, P_Nd, 42, P_No, 52, P_So, 53, P_Mn, 54, P_So, 55, P_Mn, 56, P_So, 57, P_Mn, 58, P_Ps, 59, P_Pe, 60, P_Ps, 61, P_Pe, 62, P_Mc, 64, P_Lo, 72, P_Cn, 73, P_Lo, 107, P_Cn, 113, P_Mn, 127, P_Mc, 128, P_Mn, 133, P_Po, 134, P_Mn, 136, P_Lo, 140, P_Cn, 144, P_Mn, 152, P_Cn, 153, P_Mn, 189, P_Cn, 190, P_So, 198, P_Mn, 199, P_So, 205, P_Cn, 207, P_So, 208, P_Po, 210, P_Cn,
- 0, P_Lo, 34, P_Cn, 35, P_Lo, 40, P_Cn, 41, P_Lo, 43, P_Cn, 44, P_Mc, 45, P_Mn, 49, P_Mc, 50, P_Mn, 51, P_Cn, 54, P_Mn, 56, P_Mc, 57, P_Mn, 58, P_Cn, 64, P_Nd, 74, P_Po, 80, P_Lo, 86, P_Mc, 88, P_Mn, 90, P_Cn, 160, P_Lu, 198, P_Cn, 208, P_Lo, 251, P_Po, 252, P_Lm, 253, P_Cn,
- 0, P_Lo, 90, P_Cn, 95, P_Lo, 163, P_Cn, 168, P_Lo, 250, P_Cn,
+ 0, P_Lul, 52, P_Ll, 58, P_Lu, 60, P_Ll, 61, P_Lu, 63, P_Ll, 65, P_Lul, 67, P_Lu, 71, P_Ll, 72, P_Lul, 80, P_Ll, 148, P_Lo, 149, P_Ll, 176, P_Lm, 194, P_Sk, 198, P_Lm, 210, P_Sk, 224, P_Lm, 229, P_Sk, 236, P_Lm, 237, P_Sk, 238, P_Lm, 239, P_Sk,
+ 0, P_Mn, 112, P_Lul, 116, P_Lm, 117, P_Sk, 118, P_Lul, 120, P_Cn, 122, P_Lm, 123, P_Ll, 126, P_Po, 127, P_Lu, 128, P_Cn, 132, P_Sk, 134, P_Lu, 135, P_Po, 136, P_Lu, 139, P_Cn, 140, P_Lu, 141, P_Cn, 142, P_Lu, 144, P_Ll, 145, P_Lu, 162, P_Cn, 163, P_Lu, 172, P_Ll, 207, P_Lul, 209, P_Ll, 210, P_Lu, 213, P_Ll, 216, P_Lul, 240, P_Ll, 244, P_Lul, 246, P_Sm, 247, P_Lul, 249, P_Lu, 251, P_Ll, 253, P_Lu,
+ 0, P_Lu, 48, P_Ll, 96, P_Lul, 130, P_So, 131, P_Mn, 136, P_Me, 138, P_Lul, 192, P_Lu, 194, P_Ll, 195, P_Lul, 207, P_Ll, 208, P_Lul,
+ 0, P_Lul, 48, P_Cn, 49, P_Lu, 87, P_Cn, 89, P_Lm, 90, P_Po, 96, P_Cn, 97, P_Ll, 136, P_Cn, 137, P_Po, 138, P_Pd, 139, P_Cn, 141, P_So, 143, P_Sc, 144, P_Cn, 145, P_Mn, 190, P_Pd, 191, P_Mn, 192, P_Po, 193, P_Mn, 195, P_Po, 196, P_Mn, 198, P_Po, 199, P_Mn, 200, P_Cn, 208, P_Lo, 235, P_Cn, 240, P_Lo, 243, P_Po, 245, P_Cn,
+ 0, P_Cf, 6, P_Sm, 9, P_Po, 11, P_Sc, 12, P_Po, 14, P_So, 16, P_Mn, 27, P_Po, 28, P_Cf, 29, P_Cn, 30, P_Po, 32, P_Lo, 64, P_Lm, 65, P_Lo, 75, P_Mn, 96, P_Nd, 106, P_Po, 110, P_Lo, 112, P_Mn, 113, P_Lo, 212, P_Po, 213, P_Lo, 214, P_Mn, 221, P_Cf, 222, P_So, 223, P_Mn, 229, P_Lm, 231, P_Mn, 233, P_So, 234, P_Mn, 238, P_Lo, 240, P_Nd, 250, P_Lo, 253, P_So, 255, P_Lo,
+ 0, P_Po, 14, P_Cn, 15, P_Cf, 16, P_Lo, 17, P_Mn, 18, P_Lo, 48, P_Mn, 75, P_Cn, 77, P_Lo, 166, P_Mn, 177, P_Lo, 178, P_Cn, 192, P_Nd, 202, P_Lo, 235, P_Mn, 244, P_Lm, 246, P_So, 247, P_Po, 250, P_Lm, 251, P_Cn,
+ 0, P_Lo, 22, P_Mn, 26, P_Lm, 27, P_Mn, 36, P_Lm, 37, P_Mn, 40, P_Lm, 41, P_Mn, 46, P_Cn, 48, P_Po, 63, P_Cn, 64, P_Lo, 89, P_Mn, 92, P_Cn, 94, P_Po, 95, P_Cn, 160, P_Lo, 181, P_Cn, 227, P_Mn,
+ 0, P_Mn, 3, P_Mc, 4, P_Lo, 58, P_Mn, 59, P_Mc, 60, P_Mn, 61, P_Lo, 62, P_Mc, 65, P_Mn, 73, P_Mc, 77, P_Mn, 78, P_Mc, 80, P_Lo, 81, P_Mn, 88, P_Lo, 98, P_Mn, 100, P_Po, 102, P_Nd, 112, P_Po, 113, P_Lm, 114, P_Lo, 129, P_Mn, 130, P_Mc, 132, P_Cn, 133, P_Lo, 141, P_Cn, 143, P_Lo, 145, P_Cn, 147, P_Lo, 169, P_Cn, 170, P_Lo, 177, P_Cn, 178, P_Lo, 179, P_Cn, 182, P_Lo, 186, P_Cn, 188, P_Mn, 189, P_Lo, 190, P_Mc, 193, P_Mn, 197, P_Cn, 199, P_Mc, 201, P_Cn, 203, P_Mc, 205, P_Mn, 206, P_Lo, 207, P_Cn, 215, P_Mc, 216, P_Cn, 220, P_Lo, 222, P_Cn, 223, P_Lo, 226, P_Mn, 228, P_Cn, 230, P_Nd, 240, P_Lo, 242, P_Sc, 244, P_No, 250, P_So, 251, P_Sc, 252, P_Cn,
+ 0, P_Cn, 1, P_Mn, 3, P_Mc, 4, P_Cn, 5, P_Lo, 11, P_Cn, 15, P_Lo, 17, P_Cn, 19, P_Lo, 41, P_Cn, 42, P_Lo, 49, P_Cn, 50, P_Lo, 52, P_Cn, 53, P_Lo, 55, P_Cn, 56, P_Lo, 58, P_Cn, 60, P_Mn, 61, P_Cn, 62, P_Mc, 65, P_Mn, 67, P_Cn, 71, P_Mn, 73, P_Cn, 75, P_Mn, 78, P_Cn, 81, P_Mn, 82, P_Cn, 89, P_Lo, 93, P_Cn, 94, P_Lo, 95, P_Cn, 102, P_Nd, 112, P_Mn, 114, P_Lo, 117, P_Mn, 118, P_Cn, 129, P_Mn, 131, P_Mc, 132, P_Cn, 133, P_Lo, 142, P_Cn, 143, P_Lo, 146, P_Cn, 147, P_Lo, 169, P_Cn, 170, P_Lo, 177, P_Cn, 178, P_Lo, 180, P_Cn, 181, P_Lo, 186, P_Cn, 188, P_Mn, 189, P_Lo, 190, P_Mc, 193, P_Mn, 198, P_Cn, 199, P_Mn, 201, P_Mc, 202, P_Cn, 203, P_Mc, 205, P_Mn, 206, P_Cn, 208, P_Lo, 209, P_Cn, 224, P_Lo, 226, P_Mn, 228, P_Cn, 230, P_Nd, 240, P_Po, 241, P_Sc, 242, P_Cn, 249, P_Lo, 250, P_Cn,
+ 0, P_Cn, 1, P_Mn, 2, P_Mc, 4, P_Cn, 5, P_Lo, 13, P_Cn, 15, P_Lo, 17, P_Cn, 19, P_Lo, 41, P_Cn, 42, P_Lo, 49, P_Cn, 50, P_Lo, 52, P_Cn, 53, P_Lo, 58, P_Cn, 60, P_Mn, 61, P_Lo, 62, P_Mc, 63, P_Mn, 64, P_Mc, 65, P_Mn, 69, P_Cn, 71, P_Mc, 73, P_Cn, 75, P_Mc, 77, P_Mn, 78, P_Cn, 86, P_Mn, 87, P_Mc, 88, P_Cn, 92, P_Lo, 94, P_Cn, 95, P_Lo, 98, P_Mn, 100, P_Cn, 102, P_Nd, 112, P_So, 113, P_Lo, 114, P_No, 120, P_Cn, 130, P_Mn, 131, P_Lo, 132, P_Cn, 133, P_Lo, 139, P_Cn, 142, P_Lo, 145, P_Cn, 146, P_Lo, 150, P_Cn, 153, P_Lo, 155, P_Cn, 156, P_Lo, 157, P_Cn, 158, P_Lo, 160, P_Cn, 163, P_Lo, 165, P_Cn, 168, P_Lo, 171, P_Cn, 174, P_Lo, 186, P_Cn, 190, P_Mc, 192, P_Mn, 193, P_Mc, 195, P_Cn, 198, P_Mc, 201, P_Cn, 202, P_Mc, 205, P_Mn, 206, P_Cn, 208, P_Lo, 209, P_Cn, 215, P_Mc, 216, P_Cn, 230, P_Nd, 240, P_No, 243, P_So, 249, P_Sc, 250, P_So, 251, P_Cn,
+ 0, P_Mn, 1, P_Mc, 4, P_Cn, 5, P_Lo, 13, P_Cn, 14, P_Lo, 17, P_Cn, 18, P_Lo, 41, P_Cn, 42, P_Lo, 58, P_Cn, 61, P_Lo, 62, P_Mn, 65, P_Mc, 69, P_Cn, 70, P_Mn, 73, P_Cn, 74, P_Mn, 78, P_Cn, 85, P_Mn, 87, P_Cn, 88, P_Lo, 91, P_Cn, 96, P_Lo, 98, P_Mn, 100, P_Cn, 102, P_Nd, 112, P_Cn, 120, P_No, 127, P_So, 128, P_Cn, 129, P_Mn, 130, P_Mc, 132, P_Cn, 133, P_Lo, 141, P_Cn, 142, P_Lo, 145, P_Cn, 146, P_Lo, 169, P_Cn, 170, P_Lo, 180, P_Cn, 181, P_Lo, 186, P_Cn, 188, P_Mn, 189, P_Lo, 190, P_Mc, 191, P_Mn, 192, P_Mc, 197, P_Cn, 198, P_Mn, 199, P_Mc, 201, P_Cn, 202, P_Mc, 204, P_Mn, 206, P_Cn, 213, P_Mc, 215, P_Cn, 222, P_Lo, 223, P_Cn, 224, P_Lo, 226, P_Mn, 228, P_Cn, 230, P_Nd, 240, P_Cn, 241, P_Lo, 243, P_Cn,
+ 0, P_Cn, 1, P_Mn, 2, P_Mc, 4, P_Cn, 5, P_Lo, 13, P_Cn, 14, P_Lo, 17, P_Cn, 18, P_Lo, 59, P_Cn, 61, P_Lo, 62, P_Mc, 65, P_Mn, 69, P_Cn, 70, P_Mc, 73, P_Cn, 74, P_Mc, 77, P_Mn, 78, P_Lo, 79, P_Cn, 87, P_Mc, 88, P_Cn, 95, P_Lo, 98, P_Mn, 100, P_Cn, 102, P_Nd, 112, P_No, 118, P_Cn, 121, P_So, 122, P_Lo, 128, P_Cn, 130, P_Mc, 132, P_Cn, 133, P_Lo, 151, P_Cn, 154, P_Lo, 178, P_Cn, 179, P_Lo, 188, P_Cn, 189, P_Lo, 190, P_Cn, 192, P_Lo, 199, P_Cn, 202, P_Mn, 203, P_Cn, 207, P_Mc, 210, P_Mn, 213, P_Cn, 214, P_Mn, 215, P_Cn, 216, P_Mc, 224, P_Cn, 230, P_Nd, 240, P_Cn, 242, P_Mc, 244, P_Po, 245, P_Cn,
+ 0, P_Cn, 1, P_Lo, 49, P_Mn, 50, P_Lo, 52, P_Mn, 59, P_Cn, 63, P_Sc, 64, P_Lo, 70, P_Lm, 71, P_Mn, 79, P_Po, 80, P_Nd, 90, P_Po, 92, P_Cn, 129, P_Lo, 131, P_Cn, 132, P_Lo, 133, P_Cn, 135, P_Lo, 137, P_Cn, 138, P_Lo, 139, P_Cn, 141, P_Lo, 142, P_Cn, 148, P_Lo, 152, P_Cn, 153, P_Lo, 160, P_Cn, 161, P_Lo, 164, P_Cn, 165, P_Lo, 166, P_Cn, 167, P_Lo, 168, P_Cn, 170, P_Lo, 172, P_Cn, 173, P_Lo, 177, P_Mn, 178, P_Lo, 180, P_Mn, 186, P_Cn, 187, P_Mn, 189, P_Lo, 190, P_Cn, 192, P_Lo, 197, P_Cn, 198, P_Lm, 199, P_Cn, 200, P_Mn, 206, P_Cn, 208, P_Nd, 218, P_Cn, 220, P_Lo, 224, P_Cn,
+ 0, P_Lo, 1, P_So, 4, P_Po, 19, P_So, 20, P_Po, 21, P_So, 24, P_Mn, 26, P_So, 32, P_Nd, 42, P_No, 52, P_So, 53, P_Mn, 54, P_So, 55, P_Mn, 56, P_So, 57, P_Mn, 58, P_Ps, 59, P_Pe, 60, P_Ps, 61, P_Pe, 62, P_Mc, 64, P_Lo, 72, P_Cn, 73, P_Lo, 109, P_Cn, 113, P_Mn, 127, P_Mc, 128, P_Mn, 133, P_Po, 134, P_Mn, 136, P_Lo, 141, P_Mn, 152, P_Cn, 153, P_Mn, 189, P_Cn, 190, P_So, 198, P_Mn, 199, P_So, 205, P_Cn, 206, P_So, 208, P_Po, 213, P_So, 217, P_Po, 219, P_Cn,
+ 0, P_Lo, 43, P_Mc, 45, P_Mn, 49, P_Mc, 50, P_Mn, 56, P_Mc, 57, P_Mn, 59, P_Mc, 61, P_Mn, 63, P_Lo, 64, P_Nd, 74, P_Po, 80, P_Lo, 86, P_Mc, 88, P_Mn, 90, P_Lo, 94, P_Mn, 97, P_Lo, 98, P_Mc, 101, P_Lo, 103, P_Mc, 110, P_Lo, 113, P_Mn, 117, P_Lo, 130, P_Mn, 131, P_Mc, 133, P_Mn, 135, P_Mc, 141, P_Mn, 142, P_Lo, 143, P_Mc, 144, P_Nd, 154, P_Mc, 157, P_Mn, 158, P_So, 160, P_Lu, 198, P_Cn, 199, P_Lu, 200, P_Cn, 205, P_Lu, 206, P_Cn, 208, P_Lo, 251, P_Po, 252, P_Lm, 253, P_Lo,
+ 0, P_Lo,
0, P_Lo, 73, P_Cn, 74, P_Lo, 78, P_Cn, 80, P_Lo, 87, P_Cn, 88, P_Lo, 89, P_Cn, 90, P_Lo, 94, P_Cn, 96, P_Lo, 137, P_Cn, 138, P_Lo, 142, P_Cn, 144, P_Lo, 177, P_Cn, 178, P_Lo, 182, P_Cn, 184, P_Lo, 191, P_Cn, 192, P_Lo, 193, P_Cn, 194, P_Lo, 198, P_Cn, 200, P_Lo, 215, P_Cn, 216, P_Lo,
- 0, P_Lo, 17, P_Cn, 18, P_Lo, 22, P_Cn, 24, P_Lo, 91, P_Cn, 95, P_Mn, 96, P_So, 97, P_Po, 105, P_No, 125, P_Cn, 128, P_Lo, 144, P_So, 154, P_Cn, 160, P_Lo, 245, P_Cn,
- 0, P_Cn, 1, P_Lo,
- 0, P_Lo,
- 0, P_Lo, 109, P_Po, 111, P_Lo, 119, P_Cn, 128, P_Zs, 129, P_Lo, 155, P_Ps, 156, P_Pe, 157, P_Cn, 160, P_Lo, 235, P_Po, 238, P_Nl, 241, P_Cn,
- 0, P_Lo, 13, P_Cn, 14, P_Lo, 18, P_Mn, 21, P_Cn, 32, P_Lo, 50, P_Mn, 53, P_Po, 55, P_Cn, 64, P_Lo, 82, P_Mn, 84, P_Cn, 96, P_Lo, 109, P_Cn, 110, P_Lo, 113, P_Cn, 114, P_Mn, 116, P_Cn, 128, P_Lo, 180, P_Cf, 182, P_Mc, 183, P_Mn, 190, P_Mc, 198, P_Mn, 199, P_Mc, 201, P_Mn, 212, P_Po, 215, P_Lm, 216, P_Po, 219, P_Sc, 220, P_Lo, 221, P_Mn, 222, P_Cn, 224, P_Nd, 234, P_Cn, 240, P_No, 250, P_Cn,
- 0, P_Po, 6, P_Pd, 7, P_Po, 11, P_Mn, 14, P_Zs, 15, P_Cn, 16, P_Nd, 26, P_Cn, 32, P_Lo, 67, P_Lm, 68, P_Lo, 120, P_Cn, 128, P_Lo, 169, P_Mn, 170, P_Cn,
- 0, P_Lo, 29, P_Cn, 32, P_Mn, 35, P_Mc, 39, P_Mn, 41, P_Mc, 44, P_Cn, 48, P_Mc, 50, P_Mn, 51, P_Mc, 57, P_Mn, 60, P_Cn, 64, P_So, 65, P_Cn, 68, P_Po, 70, P_Nd, 80, P_Lo, 110, P_Cn, 112, P_Lo, 117, P_Cn, 128, P_Lo, 170, P_Cn, 176, P_Mc, 193, P_Lo, 200, P_Mc, 202, P_Cn, 208, P_Nd, 218, P_Cn, 222, P_Po, 224, P_So,
- 0, P_Lo, 23, P_Mn, 25, P_Mc, 28, P_Cn, 30, P_Po, 32, P_Cn,
- 0, P_Mn, 4, P_Mc, 5, P_Lo, 52, P_Mn, 53, P_Mc, 54, P_Mn, 59, P_Mc, 60, P_Mn, 61, P_Mc, 66, P_Mn, 67, P_Mc, 69, P_Lo, 76, P_Cn, 80, P_Nd, 90, P_Po, 97, P_So, 107, P_Mn, 116, P_So, 125, P_Cn,
- 0, P_Ll, 44, P_Lm, 98, P_Ll, 120, P_Lm, 121, P_Ll, 155, P_Lm, 192, P_Mn, 203, P_Cn, 254, P_Mn,
- 0, P_Lul, 150, P_Ll, 156, P_Cn, 160, P_Lul, 250, P_Cn,
+ 0, P_Lo, 17, P_Cn, 18, P_Lo, 22, P_Cn, 24, P_Lo, 91, P_Cn, 93, P_Mn, 96, P_Po, 105, P_No, 125, P_Cn, 128, P_Lo, 144, P_So, 154, P_Cn, 160, P_Lu, 246, P_Cn, 248, P_Ll, 254, P_Cn,
+ 0, P_Pd, 1, P_Lo,
+ 0, P_Lo, 109, P_Po, 111, P_Lo, 128, P_Zs, 129, P_Lo, 155, P_Ps, 156, P_Pe, 157, P_Cn, 160, P_Lo, 235, P_Po, 238, P_Nl, 241, P_Lo, 249, P_Cn,
+ 0, P_Lo, 13, P_Cn, 14, P_Lo, 18, P_Mn, 21, P_Cn, 32, P_Lo, 50, P_Mn, 53, P_Po, 55, P_Cn, 64, P_Lo, 82, P_Mn, 84, P_Cn, 96, P_Lo, 109, P_Cn, 110, P_Lo, 113, P_Cn, 114, P_Mn, 116, P_Cn, 128, P_Lo, 180, P_Mn, 182, P_Mc, 183, P_Mn, 190, P_Mc, 198, P_Mn, 199, P_Mc, 201, P_Mn, 212, P_Po, 215, P_Lm, 216, P_Po, 219, P_Sc, 220, P_Lo, 221, P_Mn, 222, P_Cn, 224, P_Nd, 234, P_Cn, 240, P_No, 250, P_Cn,
+ 0, P_Po, 6, P_Pd, 7, P_Po, 11, P_Mn, 14, P_Cf, 15, P_Cn, 16, P_Nd, 26, P_Cn, 32, P_Lo, 67, P_Lm, 68, P_Lo, 120, P_Cn, 128, P_Lo, 169, P_Mn, 170, P_Lo, 171, P_Cn, 176, P_Lo, 246, P_Cn,
+ 0, P_Lo, 31, P_Cn, 32, P_Mn, 35, P_Mc, 39, P_Mn, 41, P_Mc, 44, P_Cn, 48, P_Mc, 50, P_Mn, 51, P_Mc, 57, P_Mn, 60, P_Cn, 64, P_So, 65, P_Cn, 68, P_Po, 70, P_Nd, 80, P_Lo, 110, P_Cn, 112, P_Lo, 117, P_Cn, 128, P_Lo, 172, P_Cn, 176, P_Lo, 202, P_Cn, 208, P_Nd, 218, P_No, 219, P_Cn, 222, P_So,
+ 0, P_Lo, 23, P_Mn, 25, P_Mc, 27, P_Mn, 28, P_Cn, 30, P_Po, 32, P_Lo, 85, P_Mc, 86, P_Mn, 87, P_Mc, 88, P_Mn, 95, P_Cn, 96, P_Mn, 97, P_Mc, 98, P_Mn, 99, P_Mc, 101, P_Mn, 109, P_Mc, 115, P_Mn, 125, P_Cn, 127, P_Mn, 128, P_Nd, 138, P_Cn, 144, P_Nd, 154, P_Cn, 160, P_Po, 167, P_Lm, 168, P_Po, 174, P_Cn, 176, P_Mn, 190, P_Me, 191, P_Cn,
+ 0, P_Mn, 4, P_Mc, 5, P_Lo, 52, P_Mn, 53, P_Mc, 54, P_Mn, 59, P_Mc, 60, P_Mn, 61, P_Mc, 66, P_Mn, 67, P_Mc, 69, P_Lo, 76, P_Cn, 80, P_Nd, 90, P_Po, 97, P_So, 107, P_Mn, 116, P_So, 125, P_Cn, 128, P_Mn, 130, P_Mc, 131, P_Lo, 161, P_Mc, 162, P_Mn, 166, P_Mc, 168, P_Mn, 170, P_Mc, 171, P_Mn, 174, P_Lo, 176, P_Nd, 186, P_Lo, 230, P_Mn, 231, P_Mc, 232, P_Mn, 234, P_Mc, 237, P_Mn, 238, P_Mc, 239, P_Mn, 242, P_Mc, 244, P_Cn, 252, P_Po,
+ 0, P_Lo, 36, P_Mc, 44, P_Mn, 52, P_Mc, 54, P_Mn, 56, P_Cn, 59, P_Po, 64, P_Nd, 74, P_Cn, 77, P_Lo, 80, P_Nd, 90, P_Lo, 120, P_Lm, 126, P_Po, 128, P_Cn, 192, P_Po, 200, P_Cn, 208, P_Mn, 211, P_Po, 212, P_Mn, 225, P_Mc, 226, P_Mn, 233, P_Lo, 237, P_Mn, 238, P_Lo, 242, P_Mc, 244, P_Mn, 245, P_Lo, 247, P_Cn, 248, P_Mn, 250, P_Cn,
+ 0, P_Ll, 44, P_Lm, 107, P_Ll, 120, P_Lm, 121, P_Ll, 155, P_Lm, 192, P_Mn, 246, P_Cn, 252, P_Mn,
+ 0, P_Lul, 150, P_Ll, 158, P_Lul,
0, P_Ll, 8, P_Lu, 16, P_Ll, 22, P_Cn, 24, P_Lu, 30, P_Cn, 32, P_Ll, 40, P_Lu, 48, P_Ll, 56, P_Lu, 64, P_Ll, 70, P_Cn, 72, P_Lu, 78, P_Cn, 80, P_Ll, 88, P_Cn, 89, P_Lu, 90, P_Cn, 91, P_Lu, 92, P_Cn, 93, P_Lu, 94, P_Cn, 95, P_Lul, 97, P_Ll, 104, P_Lu, 112, P_Ll, 126, P_Cn, 128, P_Ll, 136, P_Lt, 144, P_Ll, 152, P_Lt, 160, P_Ll, 168, P_Lt, 176, P_Ll, 181, P_Cn, 182, P_Ll, 184, P_Lu, 188, P_Lt, 189, P_Sk, 190, P_Ll, 191, P_Sk, 194, P_Ll, 197, P_Cn, 198, P_Ll, 200, P_Lu, 204, P_Lt, 205, P_Sk, 208, P_Ll, 212, P_Cn, 214, P_Ll, 216, P_Lu, 220, P_Cn, 221, P_Sk, 224, P_Ll, 232, P_Lu, 237, P_Sk, 240, P_Cn, 242, P_Ll, 245, P_Cn, 246, P_Ll, 248, P_Lu, 252, P_Lt, 253, P_Sk, 255, P_Cn,
- 0, P_Zs, 11, P_Cf, 16, P_Pd, 22, P_Po, 24, P_Pi, 25, P_Pf, 26, P_Ps, 27, P_Pi, 29, P_Pf, 30, P_Ps, 31, P_Pi, 32, P_Po, 40, P_Zl, 41, P_Zp, 42, P_Cf, 47, P_Zs, 48, P_Po, 57, P_Pi, 58, P_Pf, 59, P_Po, 63, P_Pc, 65, P_Po, 68, P_Sm, 69, P_Ps, 70, P_Pe, 71, P_Po, 82, P_Sm, 83, P_Po, 84, P_Pc, 85, P_Po, 95, P_Zs, 96, P_Cf, 100, P_Cn, 106, P_Cf, 112, P_No, 113, P_Ll, 114, P_Cn, 116, P_No, 122, P_Sm, 125, P_Ps, 126, P_Pe, 127, P_Ll, 128, P_No, 138, P_Sm, 141, P_Ps, 142, P_Pe, 143, P_Cn, 144, P_Lm, 149, P_Cn, 160, P_Sc, 182, P_Cn, 208, P_Mn, 221, P_Me, 225, P_Mn, 226, P_Me, 229, P_Mn, 240, P_Cn,
- 0, P_So, 2, P_Lu, 3, P_So, 7, P_Lu, 8, P_So, 10, P_Ll, 11, P_Lu, 14, P_Ll, 16, P_Lu, 19, P_Ll, 20, P_So, 21, P_Lu, 22, P_So, 25, P_Lu, 30, P_So, 36, P_Lu, 37, P_So, 38, P_Lu, 39, P_So, 40, P_Lu, 41, P_So, 42, P_Lu, 46, P_So, 47, P_Ll, 48, P_Lu, 52, P_Ll, 53, P_Lo, 57, P_Ll, 58, P_So, 60, P_Ll, 62, P_Lu, 64, P_Sm, 69, P_Lul, 71, P_Ll, 74, P_So, 75, P_Sm, 76, P_So, 78, P_Ll, 79, P_Cn, 83, P_No, 96, P_Nl, 131, P_Lul, 133, P_Cn, 144, P_Sm, 149, P_So, 154, P_Sm, 156, P_So, 160, P_Sm, 161, P_So, 163, P_Sm, 164, P_So, 166, P_Sm, 167, P_So, 174, P_Sm, 175, P_So, 206, P_Sm, 208, P_So, 210, P_Sm, 211, P_So, 212, P_Sm, 213, P_So, 244, P_Sm,
+ 0, P_Zs, 11, P_Cf, 16, P_Pd, 22, P_Po, 24, P_Pi, 25, P_Pf, 26, P_Ps, 27, P_Pi, 29, P_Pf, 30, P_Ps, 31, P_Pi, 32, P_Po, 40, P_Zl, 41, P_Zp, 42, P_Cf, 47, P_Zs, 48, P_Po, 57, P_Pi, 58, P_Pf, 59, P_Po, 63, P_Pc, 65, P_Po, 68, P_Sm, 69, P_Ps, 70, P_Pe, 71, P_Po, 82, P_Sm, 83, P_Po, 84, P_Pc, 85, P_Po, 95, P_Zs, 96, P_Cf, 101, P_Cn, 102, P_Cf, 112, P_No, 113, P_Lm, 114, P_Cn, 116, P_No, 122, P_Sm, 125, P_Ps, 126, P_Pe, 127, P_Lm, 128, P_No, 138, P_Sm, 141, P_Ps, 142, P_Pe, 143, P_Cn, 144, P_Lm, 157, P_Cn, 160, P_Sc, 191, P_Cn, 208, P_Mn, 221, P_Me, 225, P_Mn, 226, P_Me, 229, P_Mn, 241, P_Cn,
+ 0, P_So, 2, P_Lu, 3, P_So, 7, P_Lu, 8, P_So, 10, P_Ll, 11, P_Lu, 14, P_Ll, 16, P_Lu, 19, P_Ll, 20, P_So, 21, P_Lu, 22, P_So, 24, P_Sm, 25, P_Lu, 30, P_So, 36, P_Lu, 37, P_So, 38, P_Lu, 39, P_So, 40, P_Lu, 41, P_So, 42, P_Lu, 46, P_So, 47, P_Ll, 48, P_Lu, 52, P_Ll, 53, P_Lo, 57, P_Ll, 58, P_So, 60, P_Ll, 62, P_Lu, 64, P_Sm, 69, P_Lul, 71, P_Ll, 74, P_So, 75, P_Sm, 76, P_So, 78, P_Ll, 79, P_So, 80, P_No, 96, P_Nl, 131, P_Lul, 133, P_Nl, 137, P_No, 138, P_So, 140, P_Cn, 144, P_Sm, 149, P_So, 154, P_Sm, 156, P_So, 160, P_Sm, 161, P_So, 163, P_Sm, 164, P_So, 166, P_Sm, 167, P_So, 174, P_Sm, 175, P_So, 206, P_Sm, 208, P_So, 210, P_Sm, 211, P_So, 212, P_Sm, 213, P_So, 244, P_Sm,
0, P_Sm,
- 0, P_So, 8, P_Sm, 12, P_So, 32, P_Sm, 34, P_So, 41, P_Ps, 42, P_Pe, 43, P_So, 124, P_Sm, 125, P_So, 155, P_Sm, 180, P_So, 220, P_Sm, 226, P_So, 232, P_Cn,
+ 0, P_So, 8, P_Ps, 9, P_Pe, 10, P_Ps, 11, P_Pe, 12, P_So, 32, P_Sm, 34, P_So, 41, P_Ps, 42, P_Pe, 43, P_So, 124, P_Sm, 125, P_So, 155, P_Sm, 180, P_So, 220, P_Sm, 226, P_So, 251, P_Cn,
0, P_So, 39, P_Cn, 64, P_So, 75, P_Cn, 96, P_No, 156, P_So, 234, P_No,
0, P_So, 183, P_Sm, 184, P_So, 193, P_Sm, 194, P_So, 248, P_Sm,
- 0, P_So, 111, P_Sm, 112, P_So, 157, P_Cn, 160, P_So, 179, P_Cn,
- 0, P_Cn, 1, P_So, 5, P_Cn, 6, P_So, 10, P_Cn, 12, P_So, 40, P_Cn, 41, P_So, 76, P_Cn, 77, P_So, 78, P_Cn, 79, P_So, 83, P_Cn, 86, P_So, 87, P_Cn, 88, P_So, 95, P_Cn, 97, P_So, 104, P_Ps, 105, P_Pe, 106, P_Ps, 107, P_Pe, 108, P_Ps, 109, P_Pe, 110, P_Ps, 111, P_Pe, 112, P_Ps, 113, P_Pe, 114, P_Ps, 115, P_Pe, 116, P_Ps, 117, P_Pe, 118, P_No, 148, P_So, 149, P_Cn, 152, P_So, 176, P_Cn, 177, P_So, 191, P_Cn, 192, P_Sm, 197, P_Ps, 198, P_Pe, 199, P_Sm, 203, P_Cn, 208, P_Sm, 230, P_Ps, 231, P_Pe, 232, P_Ps, 233, P_Pe, 234, P_Ps, 235, P_Pe, 236, P_Cn, 240, P_Sm,
+ 0, P_So, 111, P_Sm, 112, P_So,
+ 0, P_So, 104, P_Ps, 105, P_Pe, 106, P_Ps, 107, P_Pe, 108, P_Ps, 109, P_Pe, 110, P_Ps, 111, P_Pe, 112, P_Ps, 113, P_Pe, 114, P_Ps, 115, P_Pe, 116, P_Ps, 117, P_Pe, 118, P_No, 148, P_So, 192, P_Sm, 197, P_Ps, 198, P_Pe, 199, P_Sm, 230, P_Ps, 231, P_Pe, 232, P_Ps, 233, P_Pe, 234, P_Ps, 235, P_Pe, 236, P_Ps, 237, P_Pe, 238, P_Ps, 239, P_Pe, 240, P_Sm,
0, P_So,
0, P_Sm, 131, P_Ps, 132, P_Pe, 133, P_Ps, 134, P_Pe, 135, P_Ps, 136, P_Pe, 137, P_Ps, 138, P_Pe, 139, P_Ps, 140, P_Pe, 141, P_Ps, 142, P_Pe, 143, P_Ps, 144, P_Pe, 145, P_Ps, 146, P_Pe, 147, P_Ps, 148, P_Pe, 149, P_Ps, 150, P_Pe, 151, P_Ps, 152, P_Pe, 153, P_Sm, 216, P_Ps, 217, P_Pe, 218, P_Ps, 219, P_Pe, 220, P_Sm, 252, P_Ps, 253, P_Pe, 254, P_Sm,
- 0, P_So, 27, P_Cn, 32, P_So, 36, P_Cn,
- 0, P_Lu, 47, P_Cn, 48, P_Ll, 95, P_Cn, 96, P_Lul, 98, P_Lu, 101, P_Ll, 103, P_Lul, 109, P_Cn, 116, P_Ll, 117, P_Lul, 119, P_Ll, 120, P_Cn, 128, P_Lul, 228, P_Ll, 229, P_So, 235, P_Cn, 249, P_Po, 253, P_No, 254, P_Po,
- 0, P_Ll, 38, P_Cn, 48, P_Lo, 102, P_Cn, 111, P_Lm, 112, P_Cn, 128, P_Lo, 151, P_Cn, 160, P_Lo, 167, P_Cn, 168, P_Lo, 175, P_Cn, 176, P_Lo, 183, P_Cn, 184, P_Lo, 191, P_Cn, 192, P_Lo, 199, P_Cn, 200, P_Lo, 207, P_Cn, 208, P_Lo, 215, P_Cn, 216, P_Lo, 223, P_Cn,
- 0, P_Po, 2, P_Pi, 3, P_Pf, 4, P_Pi, 5, P_Pf, 6, P_Po, 9, P_Pi, 10, P_Pf, 11, P_Po, 12, P_Pi, 13, P_Pf, 14, P_Po, 23, P_Pd, 24, P_Cn, 28, P_Pi, 29, P_Pf, 30, P_Cn, 128, P_So, 154, P_Cn, 155, P_So, 244, P_Cn,
+ 0, P_So, 48, P_Sm, 69, P_So, 71, P_Sm, 77, P_So, 116, P_Cn, 118, P_So, 150, P_Cn, 152, P_So, 186, P_Cn, 189, P_So, 201, P_Cn, 202, P_So, 210, P_Cn, 236, P_So, 240, P_Cn,
+ 0, P_Lu, 47, P_Cn, 48, P_Ll, 95, P_Cn, 96, P_Lul, 98, P_Lu, 101, P_Ll, 103, P_Lul, 109, P_Lu, 113, P_Ll, 114, P_Lul, 116, P_Ll, 117, P_Lul, 119, P_Ll, 124, P_Lm, 126, P_Lu, 129, P_Ll, 130, P_Lul, 228, P_Ll, 229, P_So, 235, P_Lul, 239, P_Mn, 242, P_Lul, 244, P_Cn, 249, P_Po, 253, P_No, 254, P_Po,
+ 0, P_Ll, 38, P_Cn, 39, P_Ll, 40, P_Cn, 45, P_Ll, 46, P_Cn, 48, P_Lo, 104, P_Cn, 111, P_Lm, 112, P_Po, 113, P_Cn, 127, P_Mn, 128, P_Lo, 151, P_Cn, 160, P_Lo, 167, P_Cn, 168, P_Lo, 175, P_Cn, 176, P_Lo, 183, P_Cn, 184, P_Lo, 191, P_Cn, 192, P_Lo, 199, P_Cn, 200, P_Lo, 207, P_Cn, 208, P_Lo, 215, P_Cn, 216, P_Lo, 223, P_Cn, 224, P_Mn,
+ 0, P_Po, 2, P_Pi, 3, P_Pf, 4, P_Pi, 5, P_Pf, 6, P_Po, 9, P_Pi, 10, P_Pf, 11, P_Po, 12, P_Pi, 13, P_Pf, 14, P_Po, 23, P_Pd, 24, P_Po, 26, P_Pd, 27, P_Po, 28, P_Pi, 29, P_Pf, 30, P_Po, 32, P_Pi, 33, P_Pf, 34, P_Ps, 35, P_Pe, 36, P_Ps, 37, P_Pe, 38, P_Ps, 39, P_Pe, 40, P_Ps, 41, P_Pe, 42, P_Po, 47, P_Lm, 48, P_Po, 58, P_Pd, 60, P_Po, 64, P_Pd, 65, P_Po, 66, P_Ps, 67, P_Cn, 128, P_So, 154, P_Cn, 155, P_So, 244, P_Cn,
0, P_So, 214, P_Cn, 240, P_So, 252, P_Cn,
- 0, P_Zs, 1, P_Po, 4, P_So, 5, P_Lm, 6, P_Lo, 7, P_Nl, 8, P_Ps, 9, P_Pe, 10, P_Ps, 11, P_Pe, 12, P_Ps, 13, P_Pe, 14, P_Ps, 15, P_Pe, 16, P_Ps, 17, P_Pe, 18, P_So, 20, P_Ps, 21, P_Pe, 22, P_Ps, 23, P_Pe, 24, P_Ps, 25, P_Pe, 26, P_Ps, 27, P_Pe, 28, P_Pd, 29, P_Ps, 30, P_Pe, 32, P_So, 33, P_Nl, 42, P_Mn, 48, P_Pd, 49, P_Lm, 54, P_So, 56, P_Nl, 59, P_Lm, 60, P_Lo, 61, P_Po, 62, P_So, 64, P_Cn, 65, P_Lo, 151, P_Cn, 153, P_Mn, 155, P_Sk, 157, P_Lm, 159, P_Lo, 160, P_Pd, 161, P_Lo, 251, P_Po, 252, P_Lm, 255, P_Lo,
- 0, P_Cn, 5, P_Lo, 45, P_Cn, 49, P_Lo, 143, P_Cn, 144, P_So, 146, P_No, 150, P_So, 160, P_Lo, 184, P_Cn, 192, P_So, 208, P_Cn, 240, P_Lo,
- 0, P_So, 31, P_Cn, 32, P_No, 42, P_So, 68, P_Cn, 80, P_So, 81, P_No, 96, P_So, 128, P_No, 138, P_So, 177, P_No, 192, P_So, 255, P_Cn,
+ 0, P_Zs, 1, P_Po, 4, P_So, 5, P_Lm, 6, P_Lo, 7, P_Nl, 8, P_Ps, 9, P_Pe, 10, P_Ps, 11, P_Pe, 12, P_Ps, 13, P_Pe, 14, P_Ps, 15, P_Pe, 16, P_Ps, 17, P_Pe, 18, P_So, 20, P_Ps, 21, P_Pe, 22, P_Ps, 23, P_Pe, 24, P_Ps, 25, P_Pe, 26, P_Ps, 27, P_Pe, 28, P_Pd, 29, P_Ps, 30, P_Pe, 32, P_So, 33, P_Nl, 42, P_Mn, 46, P_Mc, 48, P_Pd, 49, P_Lm, 54, P_So, 56, P_Nl, 59, P_Lm, 60, P_Lo, 61, P_Po, 62, P_So, 64, P_Cn, 65, P_Lo, 151, P_Cn, 153, P_Mn, 155, P_Sk, 157, P_Lm, 159, P_Lo, 160, P_Pd, 161, P_Lo, 251, P_Po, 252, P_Lm, 255, P_Lo,
+ 0, P_Cn, 5, P_Lo, 46, P_Cn, 49, P_Lo, 143, P_Cn, 144, P_So, 146, P_No, 150, P_So, 160, P_Lo, 187, P_Cn, 192, P_So, 228, P_Cn, 240, P_Lo,
+ 0, P_So, 31, P_Cn, 32, P_No, 42, P_So, 72, P_No, 80, P_So, 81, P_No, 96, P_So, 128, P_No, 138, P_So, 177, P_No, 192, P_So, 255, P_Cn,
0, P_Lo, 1, P_Cn,
0, P_Cn, 181, P_Lo, 182, P_Cn, 192, P_So,
- 0, P_Cn, 187, P_Lo, 188, P_Cn,
+ 0, P_Cn, 213, P_Lo, 214, P_Cn,
0, P_Lo, 21, P_Lm, 22, P_Lo,
- 0, P_Lo, 141, P_Cn, 144, P_So, 199, P_Cn,
- 0, P_Sk, 23, P_Lm, 27, P_Cn, 32, P_Sk, 34, P_Cn,
- 0, P_Lo, 2, P_Mc, 3, P_Lo, 6, P_Mn, 7, P_Lo, 11, P_Mn, 12, P_Lo, 35, P_Mc, 37, P_Mn, 39, P_Mc, 40, P_So, 44, P_Cn, 64, P_Lo, 116, P_Po, 120, P_Cn,
- 0, P_Cn, 163, P_Lo, 164, P_Cn,
+ 0, P_Lo, 141, P_Cn, 144, P_So, 199, P_Cn, 208, P_Lo, 248, P_Lm, 254, P_Po,
+ 0, P_Lo, 12, P_Lm, 13, P_Po, 16, P_Lo, 32, P_Nd, 42, P_Lo, 44, P_Cn, 64, P_Lul, 110, P_Lo, 111, P_Mn, 112, P_Me, 115, P_Po, 116, P_Mn, 126, P_Po, 127, P_Lm, 128, P_Lul, 156, P_Lm, 158, P_Mn, 160, P_Lo, 230, P_Nl, 240, P_Mn, 242, P_Po, 248, P_Cn,
+ 0, P_Sk, 23, P_Lm, 32, P_Sk, 34, P_Lul, 48, P_Ll, 50, P_Lul, 112, P_Lm, 113, P_Ll, 121, P_Lul, 125, P_Lu, 127, P_Ll, 128, P_Lul, 136, P_Lm, 137, P_Sk, 139, P_Lul, 143, P_Lo, 144, P_Lul, 148, P_Ll, 150, P_Lul, 170, P_Lu, 174, P_Cn, 176, P_Lu, 181, P_Ll, 182, P_Lul, 184, P_Cn, 247, P_Lo, 248, P_Lm, 250, P_Ll, 251, P_Lo,
+ 0, P_Lo, 2, P_Mn, 3, P_Lo, 6, P_Mn, 7, P_Lo, 11, P_Mn, 12, P_Lo, 35, P_Mc, 37, P_Mn, 39, P_Mc, 40, P_So, 44, P_Cn, 48, P_No, 54, P_So, 56, P_Sc, 57, P_So, 58, P_Cn, 64, P_Lo, 116, P_Po, 120, P_Cn, 128, P_Mc, 130, P_Lo, 180, P_Mc, 196, P_Mn, 197, P_Cn, 206, P_Po, 208, P_Nd, 218, P_Cn, 224, P_Mn, 242, P_Lo, 248, P_Po, 251, P_Lo, 252, P_Po, 253, P_Lo, 254, P_Cn,
+ 0, P_Nd, 10, P_Lo, 38, P_Mn, 46, P_Po, 48, P_Lo, 71, P_Mn, 82, P_Mc, 84, P_Cn, 95, P_Po, 96, P_Lo, 125, P_Cn, 128, P_Mn, 131, P_Mc, 132, P_Lo, 179, P_Mn, 180, P_Mc, 182, P_Mn, 186, P_Mc, 188, P_Mn, 189, P_Mc, 193, P_Po, 206, P_Cn, 207, P_Lm, 208, P_Nd, 218, P_Cn, 222, P_Po, 224, P_Lo, 229, P_Mn, 230, P_Lm, 231, P_Lo, 240, P_Nd, 250, P_Lo, 255, P_Cn,
+ 0, P_Lo, 41, P_Mn, 47, P_Mc, 49, P_Mn, 51, P_Mc, 53, P_Mn, 55, P_Cn, 64, P_Lo, 67, P_Mn, 68, P_Lo, 76, P_Mn, 77, P_Mc, 78, P_Cn, 80, P_Nd, 90, P_Cn, 92, P_Po, 96, P_Lo, 112, P_Lm, 113, P_Lo, 119, P_So, 122, P_Lo, 123, P_Mc, 124, P_Mn, 125, P_Mc, 126, P_Lo, 176, P_Mn, 177, P_Lo, 178, P_Mn, 181, P_Lo, 183, P_Mn, 185, P_Lo, 190, P_Mn, 192, P_Lo, 193, P_Mn, 194, P_Lo, 195, P_Cn, 219, P_Lo, 221, P_Lm, 222, P_Po, 224, P_Lo, 235, P_Mc, 236, P_Mn, 238, P_Mc, 240, P_Po, 242, P_Lo, 243, P_Lm, 245, P_Mc, 246, P_Mn, 247, P_Cn,
+ 0, P_Cn, 1, P_Lo, 7, P_Cn, 9, P_Lo, 15, P_Cn, 17, P_Lo, 23, P_Cn, 32, P_Lo, 39, P_Cn, 40, P_Lo, 47, P_Cn, 48, P_Ll, 91, P_Sk, 92, P_Lm, 96, P_Ll, 102, P_Cn, 112, P_Ll, 192, P_Lo, 227, P_Mc, 229, P_Mn, 230, P_Mc, 232, P_Mn, 233, P_Mc, 235, P_Po, 236, P_Mc, 237, P_Mn, 238, P_Cn, 240, P_Nd, 250, P_Cn,
+ 0, P_Cn, 163, P_Lo, 164, P_Cn, 176, P_Lo, 199, P_Cn, 203, P_Lo, 252, P_Cn,
0, P_Cs, 1, P_Cn,
0, P_Cn, 127, P_Cs, 129, P_Cn, 255, P_Cs,
0, P_Cn, 255, P_Cs,
0, P_Co, 1, P_Cn,
0, P_Cn, 255, P_Co,
- 0, P_Lo, 46, P_Cn, 48, P_Lo, 107, P_Cn, 112, P_Lo, 218, P_Cn,
- 0, P_Ll, 7, P_Cn, 19, P_Ll, 24, P_Cn, 29, P_Lo, 30, P_Mn, 31, P_Lo, 41, P_Sm, 42, P_Lo, 55, P_Cn, 56, P_Lo, 61, P_Cn, 62, P_Lo, 63, P_Cn, 64, P_Lo, 66, P_Cn, 67, P_Lo, 69, P_Cn, 70, P_Lo, 178, P_Cn, 211, P_Lo,
- 0, P_Lo, 62, P_Ps, 63, P_Pe, 64, P_Cn, 80, P_Lo, 144, P_Cn, 146, P_Lo, 200, P_Cn, 240, P_Lo, 252, P_Sc, 253, P_So, 254, P_Cn,
- 0, P_Mn, 16, P_Po, 23, P_Ps, 24, P_Pe, 25, P_Po, 26, P_Cn, 32, P_Mn, 36, P_Cn, 48, P_Po, 49, P_Pd, 51, P_Pc, 53, P_Ps, 54, P_Pe, 55, P_Ps, 56, P_Pe, 57, P_Ps, 58, P_Pe, 59, P_Ps, 60, P_Pe, 61, P_Ps, 62, P_Pe, 63, P_Ps, 64, P_Pe, 65, P_Ps, 66, P_Pe, 67, P_Ps, 68, P_Pe, 69, P_Po, 71, P_Ps, 72, P_Pe, 73, P_Po, 77, P_Pc, 80, P_Po, 83, P_Cn, 84, P_Po, 88, P_Pd, 89, P_Ps, 90, P_Pe, 91, P_Ps, 92, P_Pe, 93, P_Ps, 94, P_Pe, 95, P_Po, 98, P_Sm, 99, P_Pd, 100, P_Sm, 103, P_Cn, 104, P_Po, 105, P_Sc, 106, P_Po, 108, P_Cn, 112, P_Lo, 117, P_Cn, 118, P_Lo, 253, P_Cn, 255, P_Cf,
+ 0, P_Lo, 110, P_Cn, 112, P_Lo, 218, P_Cn,
+ 0, P_Ll, 7, P_Cn, 19, P_Ll, 24, P_Cn, 29, P_Lo, 30, P_Mn, 31, P_Lo, 41, P_Sm, 42, P_Lo, 55, P_Cn, 56, P_Lo, 61, P_Cn, 62, P_Lo, 63, P_Cn, 64, P_Lo, 66, P_Cn, 67, P_Lo, 69, P_Cn, 70, P_Lo, 178, P_Sk, 194, P_Cn, 211, P_Lo,
+ 0, P_Lo, 62, P_Pe, 63, P_Ps, 64, P_Cn, 80, P_Lo, 144, P_Cn, 146, P_Lo, 200, P_Cn, 240, P_Lo, 252, P_Sc, 253, P_So, 254, P_Cn,
+ 0, P_Mn, 16, P_Po, 23, P_Ps, 24, P_Pe, 25, P_Po, 26, P_Cn, 32, P_Mn, 48, P_Po, 49, P_Pd, 51, P_Pc, 53, P_Ps, 54, P_Pe, 55, P_Ps, 56, P_Pe, 57, P_Ps, 58, P_Pe, 59, P_Ps, 60, P_Pe, 61, P_Ps, 62, P_Pe, 63, P_Ps, 64, P_Pe, 65, P_Ps, 66, P_Pe, 67, P_Ps, 68, P_Pe, 69, P_Po, 71, P_Ps, 72, P_Pe, 73, P_Po, 77, P_Pc, 80, P_Po, 83, P_Cn, 84, P_Po, 88, P_Pd, 89, P_Ps, 90, P_Pe, 91, P_Ps, 92, P_Pe, 93, P_Ps, 94, P_Pe, 95, P_Po, 98, P_Sm, 99, P_Pd, 100, P_Sm, 103, P_Cn, 104, P_Po, 105, P_Sc, 106, P_Po, 108, P_Cn, 112, P_Lo, 117, P_Cn, 118, P_Lo, 253, P_Cn, 255, P_Cf,
0, P_Cn, 1, P_Po, 4, P_Sc, 5, P_Po, 8, P_Ps, 9, P_Pe, 10, P_Po, 11, P_Sm, 12, P_Po, 13, P_Pd, 14, P_Po, 16, P_Nd, 26, P_Po, 28, P_Sm, 31, P_Po, 33, P_Lu, 59, P_Ps, 60, P_Po, 61, P_Pe, 62, P_Sk, 63, P_Pc, 64, P_Sk, 65, P_Ll, 91, P_Ps, 92, P_Sm, 93, P_Pe, 94, P_Sm, 95, P_Ps, 96, P_Pe, 97, P_Po, 98, P_Ps, 99, P_Pe, 100, P_Po, 102, P_Lo, 112, P_Lm, 113, P_Lo, 158, P_Lm, 160, P_Lo, 191, P_Cn, 194, P_Lo, 200, P_Cn, 202, P_Lo, 208, P_Cn, 210, P_Lo, 216, P_Cn, 218, P_Lo, 221, P_Cn, 224, P_Sc, 226, P_Sm, 227, P_Sk, 228, P_So, 229, P_Sc, 231, P_Cn, 232, P_So, 233, P_Sm, 237, P_So, 239, P_Cn, 249, P_Cf, 252, P_So, 254, P_Cn,
0, P_Lo, 12, P_Cn, 13, P_Lo, 39, P_Cn, 40, P_Lo, 59, P_Cn, 60, P_Lo, 62, P_Cn, 63, P_Lo, 78, P_Cn, 80, P_Lo, 94, P_Cn, 128, P_Lo, 251, P_Cn,
- 0, P_Po, 2, P_So, 3, P_Cn, 7, P_No, 52, P_Cn, 55, P_So, 64, P_Nl, 117, P_No, 121, P_So, 138, P_No, 139, P_Cn,
- 0, P_Lo, 31, P_Cn, 32, P_No, 36, P_Cn, 48, P_Lo, 65, P_Nl, 66, P_Lo, 74, P_Nl, 75, P_Cn, 128, P_Lo, 158, P_Cn, 159, P_Po, 160, P_Lo, 196, P_Cn, 200, P_Lo, 208, P_Po, 209, P_Nl, 214, P_Cn,
+ 0, P_Po, 3, P_Cn, 7, P_No, 52, P_Cn, 55, P_So, 64, P_Nl, 117, P_No, 121, P_So, 138, P_No, 140, P_So, 141, P_Cn, 144, P_So, 156, P_Cn, 160, P_So, 161, P_Cn, 208, P_So, 253, P_Mn, 254, P_Cn,
+ 0, P_Cn, 128, P_Lo, 157, P_Cn, 160, P_Lo, 209, P_Cn, 224, P_Mn, 225, P_No, 252, P_Cn,
+ 0, P_Lo, 32, P_No, 36, P_Cn, 48, P_Lo, 65, P_Nl, 66, P_Lo, 74, P_Nl, 75, P_Cn, 80, P_Lo, 118, P_Mn, 123, P_Cn, 128, P_Lo, 158, P_Cn, 159, P_Po, 160, P_Lo, 196, P_Cn, 200, P_Lo, 208, P_Po, 209, P_Nl, 214, P_Cn,
0, P_Lu, 40, P_Ll, 80, P_Lo, 158, P_Cn, 160, P_Nd, 170, P_Cn,
- 0, P_Lo, 6, P_Cn, 8, P_Lo, 9, P_Cn, 10, P_Lo, 54, P_Cn, 55, P_Lo, 57, P_Cn, 60, P_Lo, 61, P_Cn, 63, P_Lo, 64, P_Cn,
- 0, P_Lo, 22, P_No, 26, P_Cn, 31, P_Po, 32, P_Cn,
- 0, P_Lo, 1, P_Mn, 4, P_Cn, 5, P_Mn, 7, P_Cn, 12, P_Mn, 16, P_Lo, 20, P_Cn, 21, P_Lo, 24, P_Cn, 25, P_Lo, 52, P_Cn, 56, P_Mn, 59, P_Cn, 63, P_Mn, 64, P_No, 72, P_Cn, 80, P_Po, 89, P_Cn,
- 0, P_Lo, 111, P_Cn,
- 0, P_Nl, 99, P_Cn, 112, P_Po, 116, P_Cn,
+ 0, P_Lo, 40, P_Cn, 48, P_Lo, 100, P_Cn, 111, P_Po, 112, P_Cn,
+ 0, P_Lo, 55, P_Cn, 64, P_Lo, 86, P_Cn, 96, P_Lo, 104, P_Cn,
+ 0, P_Lo, 6, P_Cn, 8, P_Lo, 9, P_Cn, 10, P_Lo, 54, P_Cn, 55, P_Lo, 57, P_Cn, 60, P_Lo, 61, P_Cn, 63, P_Lo, 86, P_Cn, 87, P_Po, 88, P_No, 96, P_Lo, 119, P_So, 121, P_No, 128, P_Lo, 159, P_Cn, 167, P_No, 176, P_Cn, 224, P_Lo, 243, P_Cn, 244, P_Lo, 246, P_Cn, 251, P_No,
+ 0, P_Lo, 22, P_No, 28, P_Cn, 31, P_Po, 32, P_Lo, 58, P_Cn, 63, P_Po, 64, P_Cn, 128, P_Lo, 184, P_Cn, 188, P_No, 190, P_Lo, 192, P_No, 208, P_Cn, 210, P_No,
+ 0, P_Lo, 1, P_Mn, 4, P_Cn, 5, P_Mn, 7, P_Cn, 12, P_Mn, 16, P_Lo, 20, P_Cn, 21, P_Lo, 24, P_Cn, 25, P_Lo, 52, P_Cn, 56, P_Mn, 59, P_Cn, 63, P_Mn, 64, P_No, 72, P_Cn, 80, P_Po, 89, P_Cn, 96, P_Lo, 125, P_No, 127, P_Po, 128, P_Lo, 157, P_No, 160, P_Cn, 192, P_Lo, 200, P_So, 201, P_Lo, 229, P_Mn, 231, P_Cn, 235, P_No, 240, P_Po, 247, P_Cn,
+ 0, P_Lo, 54, P_Cn, 57, P_Po, 64, P_Lo, 86, P_Cn, 88, P_No, 96, P_Lo, 115, P_Cn, 120, P_No, 128, P_Lo, 146, P_Cn, 153, P_Po, 157, P_Cn, 169, P_No, 176, P_Cn,
+ 0, P_Lo, 73, P_Cn, 128, P_Lu, 179, P_Cn, 192, P_Ll, 243, P_Cn, 250, P_No,
+ 0, P_Cn, 96, P_No, 127, P_Cn,
+ 0, P_Mc, 1, P_Mn, 2, P_Mc, 3, P_Lo, 56, P_Mn, 71, P_Po, 78, P_Cn, 82, P_No, 102, P_Nd, 112, P_Cn, 127, P_Mn, 130, P_Mc, 131, P_Lo, 176, P_Mc, 179, P_Mn, 183, P_Mc, 185, P_Mn, 187, P_Po, 189, P_Cf, 190, P_Po, 194, P_Cn, 208, P_Lo, 233, P_Cn, 240, P_Nd, 250, P_Cn,
+ 0, P_Mn, 3, P_Lo, 39, P_Mn, 44, P_Mc, 45, P_Mn, 53, P_Cn, 54, P_Nd, 64, P_Po, 68, P_Cn, 80, P_Lo, 115, P_Mn, 116, P_Po, 118, P_Lo, 119, P_Cn, 128, P_Mn, 130, P_Mc, 131, P_Lo, 179, P_Mc, 182, P_Mn, 191, P_Mc, 193, P_Lo, 197, P_Po, 202, P_Mn, 205, P_Po, 206, P_Cn, 208, P_Nd, 218, P_Lo, 219, P_Po, 220, P_Lo, 221, P_Po, 224, P_Cn, 225, P_No, 245, P_Cn,
+ 0, P_Lo, 18, P_Cn, 19, P_Lo, 44, P_Mc, 47, P_Mn, 50, P_Mc, 52, P_Mn, 53, P_Mc, 54, P_Mn, 56, P_Po, 62, P_Cn, 128, P_Lo, 135, P_Cn, 136, P_Lo, 137, P_Cn, 138, P_Lo, 142, P_Cn, 143, P_Lo, 158, P_Cn, 159, P_Lo, 169, P_Po, 170, P_Cn, 176, P_Lo, 223, P_Mn, 224, P_Mc, 227, P_Mn, 235, P_Cn, 240, P_Nd, 250, P_Cn,
+ 0, P_Mn, 2, P_Mc, 4, P_Cn, 5, P_Lo, 13, P_Cn, 15, P_Lo, 17, P_Cn, 19, P_Lo, 41, P_Cn, 42, P_Lo, 49, P_Cn, 50, P_Lo, 52, P_Cn, 53, P_Lo, 58, P_Cn, 60, P_Mn, 61, P_Lo, 62, P_Mc, 64, P_Mn, 65, P_Mc, 69, P_Cn, 71, P_Mc, 73, P_Cn, 75, P_Mc, 78, P_Cn, 80, P_Lo, 81, P_Cn, 87, P_Mc, 88, P_Cn, 93, P_Lo, 98, P_Mc, 100, P_Cn, 102, P_Mn, 109, P_Cn, 112, P_Mn, 117, P_Cn,
+ 0, P_Cn, 128, P_Lo, 176, P_Mc, 179, P_Mn, 185, P_Mc, 186, P_Mn, 187, P_Mc, 191, P_Mn, 193, P_Mc, 194, P_Mn, 196, P_Lo, 198, P_Po, 199, P_Lo, 200, P_Cn, 208, P_Nd, 218, P_Cn,
+ 0, P_Cn, 128, P_Lo, 175, P_Mc, 178, P_Mn, 182, P_Cn, 184, P_Mc, 188, P_Mn, 190, P_Mc, 191, P_Mn, 193, P_Po, 216, P_Lo, 220, P_Mn, 222, P_Cn,
+ 0, P_Lo, 48, P_Mc, 51, P_Mn, 59, P_Mc, 61, P_Mn, 62, P_Mc, 63, P_Mn, 65, P_Po, 68, P_Lo, 69, P_Cn, 80, P_Nd, 90, P_Cn, 128, P_Lo, 171, P_Mn, 172, P_Mc, 173, P_Mn, 174, P_Mc, 176, P_Mn, 182, P_Mc, 183, P_Mn, 184, P_Cn, 192, P_Nd, 202, P_Cn,
+ 0, P_Lo, 26, P_Cn, 29, P_Mn, 32, P_Mc, 34, P_Mn, 38, P_Mc, 39, P_Mn, 44, P_Cn, 48, P_Nd, 58, P_No, 60, P_Po, 63, P_So, 64, P_Cn,
+ 0, P_Cn, 160, P_Lu, 192, P_Ll, 224, P_Nd, 234, P_No, 243, P_Cn, 255, P_Lo,
+ 0, P_Cn, 192, P_Lo, 249, P_Cn,
+ 0, P_Lo, 154, P_Cn,
+ 0, P_Nl, 111, P_Cn, 112, P_Po, 117, P_Cn, 128, P_Lo,
+ 0, P_Lo, 68, P_Cn,
+ 0, P_Lo, 47, P_Cn,
+ 0, P_Lo, 71, P_Cn,
+ 0, P_Lo, 57, P_Cn, 64, P_Lo, 95, P_Cn, 96, P_Nd, 106, P_Cn, 110, P_Po, 112, P_Cn, 208, P_Lo, 238, P_Cn, 240, P_Mn, 245, P_Po, 246, P_Cn,
+ 0, P_Lo, 48, P_Mn, 55, P_Po, 60, P_So, 64, P_Lm, 68, P_Po, 69, P_So, 70, P_Cn, 80, P_Nd, 90, P_Cn, 91, P_No, 98, P_Cn, 99, P_Lo, 120, P_Cn, 125, P_Lo, 144, P_Cn,
+ 0, P_Lo, 69, P_Cn, 80, P_Lo, 81, P_Mc, 127, P_Cn, 143, P_Mn, 147, P_Lm, 160, P_Cn,
+ 0, P_Lo, 2, P_Cn,
+ 0, P_Lo, 107, P_Cn, 112, P_Lo, 125, P_Cn, 128, P_Lo, 137, P_Cn, 144, P_Lo, 154, P_Cn, 156, P_So, 157, P_Mn, 159, P_Po, 160, P_Cf, 164, P_Cn,
0, P_So, 246, P_Cn,
- 0, P_So, 39, P_Cn, 42, P_So, 101, P_Mc, 103, P_Mn, 106, P_So, 109, P_Mc, 115, P_Cf, 123, P_Mn, 131, P_So, 133, P_Mn, 140, P_So, 170, P_Mn, 174, P_So, 222, P_Cn,
+ 0, P_So, 39, P_Cn, 41, P_So, 101, P_Mc, 103, P_Mn, 106, P_So, 109, P_Mc, 115, P_Cf, 123, P_Mn, 131, P_So, 133, P_Mn, 140, P_So, 170, P_Mn, 174, P_So, 233, P_Cn,
0, P_So, 66, P_Mn, 69, P_So, 70, P_Cn,
0, P_So, 87, P_Cn, 96, P_No, 114, P_Cn,
0, P_Lu, 26, P_Ll, 52, P_Lu, 78, P_Ll, 85, P_Cn, 86, P_Ll, 104, P_Lu, 130, P_Ll, 156, P_Lu, 157, P_Cn, 158, P_Lu, 160, P_Cn, 162, P_Lu, 163, P_Cn, 165, P_Lu, 167, P_Cn, 169, P_Lu, 173, P_Cn, 174, P_Lu, 182, P_Ll, 186, P_Cn, 187, P_Ll, 188, P_Cn, 189, P_Ll, 196, P_Cn, 197, P_Ll, 208, P_Lu, 234, P_Ll,
@@ -100,7 +129,22 @@
0, P_Ll, 4, P_Lu, 6, P_Cn, 7, P_Lu, 11, P_Cn, 13, P_Lu, 21, P_Cn, 22, P_Lu, 29, P_Cn, 30, P_Ll, 56, P_Lu, 58, P_Cn, 59, P_Lu, 63, P_Cn, 64, P_Lu, 69, P_Cn, 70, P_Lu, 71, P_Cn, 74, P_Lu, 81, P_Cn, 82, P_Ll, 108, P_Lu, 134, P_Ll, 160, P_Lu, 186, P_Ll, 212, P_Lu, 238, P_Ll,
0, P_Ll, 8, P_Lu, 34, P_Ll, 60, P_Lu, 86, P_Ll, 112, P_Lu, 138, P_Ll, 166, P_Cn, 168, P_Lu, 193, P_Sm, 194, P_Ll, 219, P_Sm, 220, P_Ll, 226, P_Lu, 251, P_Sm, 252, P_Ll,
0, P_Ll, 21, P_Sm, 22, P_Ll, 28, P_Lu, 53, P_Sm, 54, P_Ll, 79, P_Sm, 80, P_Ll, 86, P_Lu, 111, P_Sm, 112, P_Ll, 137, P_Sm, 138, P_Ll, 144, P_Lu, 169, P_Sm, 170, P_Ll, 195, P_Sm, 196, P_Ll, 202, P_Lul, 204, P_Cn, 206, P_Nd,
+ 0, P_Mn, 55, P_So, 59, P_Mn, 109, P_So, 117, P_Mn, 118, P_So, 132, P_Mn, 133, P_So, 135, P_Po, 140, P_Cn, 155, P_Mn, 160, P_Cn, 161, P_Mn, 176, P_Cn,
+ 0, P_Lo, 197, P_Cn, 199, P_No, 208, P_Mn, 215, P_Cn,
+ 0, P_Lo, 4, P_Cn, 5, P_Lo, 32, P_Cn, 33, P_Lo, 35, P_Cn, 36, P_Lo, 37, P_Cn, 39, P_Lo, 40, P_Cn, 41, P_Lo, 51, P_Cn, 52, P_Lo, 56, P_Cn, 57, P_Lo, 58, P_Cn, 59, P_Lo, 60, P_Cn, 66, P_Lo, 67, P_Cn, 71, P_Lo, 72, P_Cn, 73, P_Lo, 74, P_Cn, 75, P_Lo, 76, P_Cn, 77, P_Lo, 80, P_Cn, 81, P_Lo, 83, P_Cn, 84, P_Lo, 85, P_Cn, 87, P_Lo, 88, P_Cn, 89, P_Lo, 90, P_Cn, 91, P_Lo, 92, P_Cn, 93, P_Lo, 94, P_Cn, 95, P_Lo, 96, P_Cn, 97, P_Lo, 99, P_Cn, 100, P_Lo, 101, P_Cn, 103, P_Lo, 107, P_Cn, 108, P_Lo, 115, P_Cn, 116, P_Lo, 120, P_Cn, 121, P_Lo, 125, P_Cn, 126, P_Lo, 127, P_Cn, 128, P_Lo, 138, P_Cn, 139, P_Lo, 156, P_Cn, 161, P_Lo, 164, P_Cn, 165, P_Lo, 170, P_Cn, 171, P_Lo, 188, P_Cn, 240, P_Sm, 242, P_Cn,
+ 0, P_So, 44, P_Cn, 48, P_So, 148, P_Cn, 160, P_So, 175, P_Cn, 177, P_So, 192, P_Cn, 193, P_So, 208, P_Cn, 209, P_So, 246, P_Cn,
+ 0, P_No, 13, P_Cn, 16, P_So, 47, P_Cn, 48, P_So, 108, P_Cn, 112, P_So, 155, P_Cn, 230, P_So,
+ 0, P_So, 3, P_Cn, 16, P_So, 59, P_Cn, 64, P_So, 73, P_Cn, 80, P_So, 82, P_Cn,
+ 0, P_So, 251, P_Sk,
+ 0, P_So, 122, P_Cn, 123, P_So, 164, P_Cn, 165, P_So,
+ 0, P_So, 209, P_Cn, 224, P_So, 237, P_Cn, 240, P_So, 244, P_Cn,
+ 0, P_So, 116, P_Cn, 128, P_So, 213, P_Cn,
+ 0, P_So, 12, P_Cn, 16, P_So, 72, P_Cn, 80, P_So, 90, P_Cn, 96, P_So, 136, P_Cn, 144, P_So, 174, P_Cn,
+ 0, P_Cn, 16, P_So, 25, P_Cn, 128, P_So, 133, P_Cn, 192, P_So, 193, P_Cn,
0, P_Cn, 214, P_Lo, 215, P_Cn,
+ 0, P_Cn, 52, P_Lo, 53, P_Cn, 64, P_Lo, 65, P_Cn,
+ 0, P_Cn, 29, P_Lo, 30, P_Cn, 32, P_Lo, 33, P_Cn,
+ 0, P_Cn, 161, P_Lo, 162, P_Cn,
0, P_Lo, 30, P_Cn,
0, P_Cn, 1, P_Cf, 2, P_Cn, 32, P_Cf, 128, P_Cn,
0, P_Mn, 240, P_Cn,
@@ -109,127 +153,188 @@
const unsigned int UnicodeProperty::property_offsets[] = {
0x0, 2, 122,
0x100, 122, 248,
- 0x200, 248, 290,
- 0x300, 290, 356,
- 0x400, 356, 382,
- 0x500, 382, 436,
- 0x600, 436, 510,
- 0x700, 510, 554,
- 0x800, 0, 2,
- 0x900, 554, 678,
- 0xA00, 678, 818,
- 0xB00, 818, 972,
- 0xC00, 972, 1094,
- 0xD00, 1094, 1192,
- 0xE00, 1192, 1300,
- 0xF00, 1300, 1382,
- 0x1000, 1382, 1436,
- 0x1100, 1436, 1448,
- 0x1200, 1448, 1502,
- 0x1300, 1502, 1534,
- 0x1400, 1534, 1538,
- 0x1500, 1538, 1540,
- 0x1600, 1540, 1566,
- 0x1700, 1566, 1640,
- 0x1800, 1640, 1670,
- 0x1900, 1670, 1730,
- 0x1A00, 1730, 1742,
- 0x1B00, 1742, 1780,
- 0x1C00, 0, 2,
- 0x1D00, 1780, 1798,
- 0x1E00, 1798, 1808,
- 0x1F00, 1808, 1936,
- 0x2000, 1936, 2050,
- 0x2100, 2050, 2174,
- 0x2200, 2174, 2176,
- 0x2300, 2176, 2206,
- 0x2400, 2206, 2220,
- 0x2500, 2220, 2232,
- 0x2600, 2232, 2244,
- 0x2700, 2244, 2350,
- 0x2800, 2350, 2352,
- 0x2900, 2352, 2416,
- 0x2A00, 2174, 2176,
- 0x2B00, 2416, 2424,
- 0x2C00, 2424, 2464,
- 0x2D00, 2464, 2512,
- 0x2E00, 2512, 2554,
- 0x2F00, 2554, 2562,
- 0x3000, 2562, 2664,
- 0x3100, 2664, 2690,
- 0x3200, 2690, 2716,
- 0x3300, 2350, 2352,
- 0x3400, 2716, 2720,
+ 0x200, 248, 294,
+ 0x300, 294, 366,
+ 0x400, 366, 390,
+ 0x500, 390, 450,
+ 0x600, 450, 520,
+ 0x700, 520, 560,
+ 0x800, 560, 598,
+ 0x900, 598, 720,
+ 0xA00, 720, 870,
+ 0xB00, 870, 1032,
+ 0xC00, 1032, 1166,
+ 0xD00, 1166, 1280,
+ 0xE00, 1280, 1388,
+ 0xF00, 1388, 1476,
+ 0x1000, 1476, 1566,
+ 0x1100, 1566, 1568,
+ 0x1200, 1568, 1622,
+ 0x1300, 1622, 1656,
+ 0x1400, 1656, 1660,
+ 0x1500, 1566, 1568,
+ 0x1600, 1660, 1686,
+ 0x1700, 1686, 1760,
+ 0x1800, 1760, 1796,
+ 0x1900, 1796, 1852,
+ 0x1A00, 1852, 1916,
+ 0x1B00, 1916, 1998,
+ 0x1C00, 1998, 2060,
+ 0x1D00, 2060, 2078,
+ 0x1E00, 2078, 2084,
+ 0x1F00, 2084, 2212,
+ 0x2000, 2212, 2326,
+ 0x2100, 2326, 2458,
+ 0x2200, 2458, 2460,
+ 0x2300, 2460, 2496,
+ 0x2400, 2496, 2510,
+ 0x2500, 2510, 2522,
+ 0x2600, 2522, 2528,
+ 0x2700, 2528, 2592,
+ 0x2800, 2592, 2594,
+ 0x2900, 2594, 2658,
+ 0x2A00, 2458, 2460,
+ 0x2B00, 2658, 2690,
+ 0x2C00, 2690, 2744,
+ 0x2D00, 2744, 2806,
+ 0x2E00, 2806, 2890,
+ 0x2F00, 2890, 2898,
+ 0x3000, 2898, 3002,
+ 0x3100, 3002, 3028,
+ 0x3200, 3028, 3054,
+ 0x3300, 2592, 2594,
+ 0x3400, 3054, 3058,
0x3500, 0, 2,
- 0x4D00, 2720, 2728,
- 0x4E00, 2716, 2720,
+ 0x4D00, 3058, 3066,
+ 0x4E00, 3054, 3058,
0x4F00, 0, 2,
- 0x9F00, 2728, 2734,
- 0xA000, 2734, 2740,
- 0xA100, 1538, 1540,
- 0xA400, 2740, 2748,
- 0xA500, 0, 2,
- 0xA700, 2748, 2758,
- 0xA800, 2758, 2788,
- 0xA900, 0, 2,
- 0xAC00, 2716, 2720,
+ 0x9F00, 3066, 3072,
+ 0xA000, 3072, 3078,
+ 0xA100, 1566, 1568,
+ 0xA400, 3078, 3092,
+ 0xA500, 1566, 1568,
+ 0xA600, 3092, 3138,
+ 0xA700, 3138, 3196,
+ 0xA800, 3196, 3266,
+ 0xA900, 3266, 3332,
+ 0xAA00, 3332, 3430,
+ 0xAB00, 3430, 3488,
+ 0xAC00, 3054, 3058,
0xAD00, 0, 2,
- 0xD700, 2788, 2794,
- 0xD800, 2794, 2798,
+ 0xD700, 3488, 3502,
+ 0xD800, 3502, 3506,
0xD900, 0, 2,
- 0xDB00, 2798, 2806,
- 0xDC00, 2794, 2798,
+ 0xDB00, 3506, 3514,
+ 0xDC00, 3502, 3506,
0xDD00, 0, 2,
- 0xDF00, 2806, 2810,
- 0xE000, 2810, 2814,
+ 0xDF00, 3514, 3518,
+ 0xE000, 3518, 3522,
0xE100, 0, 2,
- 0xF800, 2814, 2818,
- 0xF900, 1538, 1540,
- 0xFA00, 2818, 2830,
- 0xFB00, 2830, 2872,
- 0xFC00, 1538, 1540,
- 0xFD00, 2872, 2896,
- 0xFE00, 2896, 3008,
- 0xFF00, 3008, 3128,
- 0x10000, 3128, 3156,
- 0x10100, 3156, 3178,
- 0x10200, 0, 2,
- 0x10300, 3178, 3214,
- 0x10400, 3214, 3226,
- 0x10500, 0, 2,
- 0x10800, 3226, 3250,
- 0x10900, 3250, 3260,
- 0x10A00, 3260, 3298,
- 0x10B00, 0, 2,
- 0x12000, 1538, 1540,
- 0x12300, 3298, 3302,
- 0x12400, 3302, 3310,
- 0x12500, 0, 2,
- 0x1D000, 3310, 3314,
- 0x1D100, 3314, 3344,
- 0x1D200, 3344, 3352,
- 0x1D300, 3352, 3360,
- 0x1D400, 3360, 3416,
- 0x1D500, 3416, 3470,
- 0x1D600, 3470, 3502,
- 0x1D700, 3502, 3544,
- 0x1D800, 0, 2,
- 0x20000, 2716, 2720,
+ 0xF800, 3522, 3526,
+ 0xF900, 1566, 1568,
+ 0xFA00, 3526, 3534,
+ 0xFB00, 3534, 3578,
+ 0xFC00, 1566, 1568,
+ 0xFD00, 3578, 3602,
+ 0xFE00, 3602, 3712,
+ 0xFF00, 3712, 3832,
+ 0x10000, 3832, 3860,
+ 0x10100, 3860, 3896,
+ 0x10200, 3896, 3912,
+ 0x10300, 3912, 3952,
+ 0x10400, 3952, 3964,
+ 0x10500, 3964, 3976,
+ 0x10600, 1566, 1568,
+ 0x10700, 3976, 3988,
+ 0x10800, 3988, 4040,
+ 0x10900, 4040, 4070,
+ 0x10A00, 4070, 4136,
+ 0x10B00, 4136, 4166,
+ 0x10C00, 4166, 4180,
+ 0x10D00, 0, 2,
+ 0x10E00, 4180, 4186,
+ 0x10F00, 0, 2,
+ 0x11000, 4186, 4236,
+ 0x11100, 4236, 4302,
+ 0x11200, 4302, 4360,
+ 0x11300, 4360, 4432,
+ 0x11400, 4432, 4464,
+ 0x11500, 4464, 4490,
+ 0x11600, 4490, 4536,
+ 0x11700, 4536, 4562,
+ 0x11800, 4562, 4576,
+ 0x11900, 0, 2,
+ 0x11A00, 4576, 4582,
+ 0x11B00, 0, 2,
+ 0x12000, 1566, 1568,
+ 0x12300, 4582, 4586,
+ 0x12400, 4586, 4596,
+ 0x12500, 4596, 4600,
+ 0x12600, 0, 2,
+ 0x13000, 1566, 1568,
+ 0x13400, 4600, 4604,
+ 0x13500, 0, 2,
+ 0x14400, 1566, 1568,
+ 0x14600, 4604, 4608,
+ 0x14700, 0, 2,
+ 0x16800, 1566, 1568,
+ 0x16A00, 4608, 4634,
+ 0x16B00, 4634, 4666,
+ 0x16C00, 0, 2,
+ 0x16F00, 4666, 4682,
+ 0x17000, 0, 2,
+ 0x1B000, 4682, 4686,
+ 0x1B100, 0, 2,
+ 0x1BC00, 4686, 4712,
+ 0x1BD00, 0, 2,
+ 0x1D000, 4712, 4716,
+ 0x1D100, 4716, 4746,
+ 0x1D200, 4746, 4754,
+ 0x1D300, 4754, 4762,
+ 0x1D400, 4762, 4818,
+ 0x1D500, 4818, 4872,
+ 0x1D600, 4872, 4904,
+ 0x1D700, 4904, 4946,
+ 0x1D800, 2592, 2594,
+ 0x1DA00, 4946, 4974,
+ 0x1DB00, 0, 2,
+ 0x1E800, 4974, 4984,
+ 0x1E900, 0, 2,
+ 0x1EE00, 4984, 5120,
+ 0x1EF00, 0, 2,
+ 0x1F000, 5120, 5144,
+ 0x1F100, 5144, 5162,
+ 0x1F200, 5162, 5178,
+ 0x1F300, 5178, 5182,
+ 0x1F400, 2592, 2594,
+ 0x1F500, 5182, 5192,
+ 0x1F600, 5192, 5204,
+ 0x1F700, 5204, 5212,
+ 0x1F800, 5212, 5232,
+ 0x1F900, 5232, 5246,
+ 0x1FA00, 0, 2,
+ 0x20000, 3054, 3058,
0x20100, 0, 2,
- 0x2A600, 3544, 3550,
- 0x2A700, 0, 2,
- 0x2F800, 1538, 1540,
- 0x2FA00, 3550, 3554,
+ 0x2A600, 5246, 5252,
+ 0x2A700, 3054, 3058,
+ 0x2A800, 0, 2,
+ 0x2B700, 5252, 5262,
+ 0x2B800, 5262, 5272,
+ 0x2B900, 0, 2,
+ 0x2CE00, 5272, 5278,
+ 0x2CF00, 0, 2,
+ 0x2F800, 1566, 1568,
+ 0x2FA00, 5278, 5282,
0x2FB00, 0, 2,
- 0xE0000, 3554, 3564,
- 0xE0100, 3564, 3568,
+ 0xE0000, 5282, 5292,
+ 0xE0100, 5292, 5296,
0xE0200, 0, 2,
- 0xF0000, 2810, 2814,
+ 0xF0000, 3518, 3522,
0xF0100, 0, 2,
- 0xFFF00, 3568, 3574,
- 0x100000, 2810, 2814,
+ 0xFFF00, 5296, 5302,
+ 0x100000, 3518, 3522,
0x100100, 0, 2,
- 0x10FF00, 3568, 3574,
+ 0x10FF00, 5296, 5302,
0x110000, 0, 2,
};
const int UnicodeProperty::nproperty_offsets = (sizeof(UnicodeProperty::property_offsets) / (3*sizeof(unsigned int)));
@@ -239,18 +344,18 @@
{
// Up to U+1A00 each page has its own definition.
if (u < 0x1A00)
- return &property_offsets[3*(u >> 8)];
+ return &property_offsets[3*(u >> 8)];
// At or after U+1A00, binary search.
int l = 0x1A, r = nproperty_offsets - 2;
while (l <= r) {
- int m = (l + r) / 2;
- const unsigned int *ptr = &property_offsets[3*m];
- if (u < ptr[0])
- r = m - 1;
- else if (u >= ptr[3])
- l = m + 1;
- else
- return ptr;
+ int m = (l + r) / 2;
+ const unsigned int *ptr = &property_offsets[3*m];
+ if (u < ptr[0])
+ r = m - 1;
+ else if (u >= ptr[3])
+ l = m + 1;
+ else
+ return ptr;
}
// If search fails, return last record, which will be all-unassigned.
return &property_offsets[3*(nproperty_offsets - 1)];
@@ -268,16 +373,16 @@
int l = offsets[1], r = offsets[2] - 4;
const unsigned char *the_ptr;
while (l <= r) {
- int m = ((l + r) / 2) & ~1;
- const unsigned char *ptr = &property_pages[m];
- if (u < ptr[0])
- r = m - 2;
- else if (u >= ptr[2])
- l = m + 2;
- else {
- the_ptr = ptr;
- goto found_ptr;
- }
+ int m = ((l + r) / 2) & ~1;
+ const unsigned char *ptr = &property_pages[m];
+ if (u < ptr[0])
+ r = m - 2;
+ else if (u >= ptr[2])
+ l = m + 2;
+ else {
+ the_ptr = ptr;
+ goto found_ptr;
+ }
}
the_ptr = &property_pages[l];
@@ -284,9 +389,9 @@
found_ptr:
// Found right block.
if (the_ptr[1] == P_Lul)
- return ((u - the_ptr[0]) % 2 ? P_Ll : P_Lu);
+ return ((u - the_ptr[0]) % 2 ? P_Ll : P_Lu);
else
- return the_ptr[1];
+ return the_ptr[1];
}
static const char property_names[] =
@@ -317,9 +422,9 @@
UnicodeProperty::property_name(int p)
{
if (p >= 0 && p <= P_Sk && property_names[p*3])
- return &property_names[p*3];
+ return &property_names[p*3];
else
- return "?";
+ return "?";
}
bool
@@ -326,40 +431,40 @@
UnicodeProperty::parse_property(const String &s, int &prop, int &prop_mask)
{
if (s.length() == 0)
- return false;
+ return false;
else if (s.length() <= 2) {
- for (int i = 0; i <= P_S; i += 010)
- if (property_names[3*i] == s[0]) {
- if (s.length() == 1) {
- prop = i;
- prop_mask = P_TMASK;
- return true;
- }
- for (; property_names[3*i]; i++)
- if (property_names[3*i+1] == s[1]) {
- prop = i;
- prop_mask = 0377;
- return true;
- }
- break;
- }
- return false;
+ for (int i = 0; i <= P_S; i += 010)
+ if (property_names[3*i] == s[0]) {
+ if (s.length() == 1) {
+ prop = i;
+ prop_mask = P_TMASK;
+ return true;
+ }
+ for (; property_names[3*i]; i++)
+ if (property_names[3*i+1] == s[1]) {
+ prop = i;
+ prop_mask = 0377;
+ return true;
+ }
+ break;
+ }
+ return false;
} else {
- const char * const *dict = property_category_long_names;
- for (int i = 0; i <= P_S; i += 010, dict++)
- if (s == *dict) {
- prop = i;
- prop_mask = P_TMASK;
- return true;
- }
+ const char * const *dict = property_category_long_names;
+ for (int i = 0; i <= P_S; i += 010, dict++)
+ if (s == *dict) {
+ prop = i;
+ prop_mask = P_TMASK;
+ return true;
+ }
dict = property_long_names;
- for (int i = 0; i <= P_Sk; i++, dict++)
- if (*dict && s == *dict) {
- prop = i;
- prop_mask = 0377;
- return true;
- }
- return false;
+ for (int i = 0; i <= P_Sk; i++, dict++)
+ if (*dict && s == *dict) {
+ prop = i;
+ prop_mask = 0377;
+ return true;
+ }
+ return false;
}
}
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/util.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/util.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/util.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* util.{cc,hh} -- various bits
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = t1dotlessj$(EXEEXT)
-subdir = lcdf-typetools-src/t1dotlessj
+subdir = t1dotlessj
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -115,10 +103,6 @@
am_t1dotlessj_OBJECTS = t1dotlessj.$(OBJEXT)
t1dotlessj_OBJECTS = $(am_t1dotlessj_OBJECTS)
t1dotlessj_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -132,22 +116,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -208,14 +188,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -229,19 +206,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -251,27 +223,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -280,9 +240,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -289,16 +247,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -305,11 +259,7 @@
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@
@@ -318,11 +268,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -356,7 +302,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -366,9 +312,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1dotlessj/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1dotlessj/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/t1dotlessj/Makefile
+ $(AUTOMAKE) --foreign t1dotlessj/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -396,7 +342,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -411,8 +356,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -428,13 +373,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
t1dotlessj$(EXEEXT): $(t1dotlessj_OBJECTS) $(t1dotlessj_DEPENDENCIES) $(EXTRA_t1dotlessj_DEPENDENCIES)
@rm -f t1dotlessj$(EXEEXT)
@@ -449,34 +388,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t1dotlessj.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -643,7 +566,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -698,8 +621,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -716,18 +638,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/t1dotlessj.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/t1dotlessj.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/t1dotlessj.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,4 +1,4 @@
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/t1dotlessj.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/t1dotlessj.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/t1dotlessj.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* t1dotlessj.cc -- driver for creating dotlessj characters from Type 1 fonts
*
- * Copyright (c) 2003-2013 Eddie Kohler
+ * Copyright (c) 2003-2016 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
@@ -73,7 +73,7 @@
if (!error_message)
errh->message("Usage: %s [OPTIONS] [FONTFILE [OUTPUTFILE]]", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(EXIT_ERROR);
}
@@ -317,7 +317,7 @@
case VERSION_OPT:
printf("t1dotlessj (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2003-2013 Eddie Kohler\n\
+ printf("Copyright (C) 2003-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = t1lint$(EXEEXT)
-subdir = lcdf-typetools-src/t1lint
+subdir = t1lint
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -115,10 +103,6 @@
am_t1lint_OBJECTS = cscheck.$(OBJEXT) t1lint.$(OBJEXT)
t1lint_OBJECTS = $(am_t1lint_OBJECTS)
t1lint_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -132,22 +116,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -154,18 +134,12 @@
am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
@@ -226,14 +200,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -247,19 +218,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -269,27 +235,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -298,9 +252,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -307,16 +259,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -323,11 +271,7 @@
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@
@@ -336,11 +280,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -376,7 +316,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -386,9 +326,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1lint/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1lint/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/t1lint/Makefile
+ $(AUTOMAKE) --foreign t1lint/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -416,7 +356,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -431,8 +370,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -448,13 +387,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
t1lint$(EXEEXT): $(t1lint_OBJECTS) $(t1lint_DEPENDENCIES) $(EXTRA_t1lint_DEPENDENCIES)
@rm -f t1lint$(EXEEXT)
@@ -470,34 +403,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t1lint.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -664,7 +581,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -719,8 +636,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -737,18 +653,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/cscheck.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/cscheck.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/cscheck.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* cscheck.{cc,hh} -- checking Type 1 charstrings for validity
*
- * Copyright (c) 1999-2012 Eddie Kohler
+ * Copyright (c) 1999-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/t1lint.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/t1lint.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/t1lint.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,4 +1,4 @@
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/t1lint.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/t1lint.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/t1lint.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* t1lint.cc -- driver for checking Type 1 fonts for validity
*
- * Copyright (c) 1999-2013 Eddie Kohler
+ * Copyright (c) 1999-2016 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
@@ -60,7 +60,7 @@
if (!error_message)
errh->message("Usage: %s [OPTION]... FONT", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -412,7 +412,7 @@
case VERSION_OPT:
printf("t1lint (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1999-2013 Eddie Kohler\n\
+ printf("Copyright (C) 1999-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = t1rawafm$(EXEEXT)
-subdir = lcdf-typetools-src/t1rawafm
+subdir = t1rawafm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -115,10 +103,6 @@
am_t1rawafm_OBJECTS = t1rawafm.$(OBJEXT)
t1rawafm_OBJECTS = $(am_t1rawafm_OBJECTS)
t1rawafm_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -132,22 +116,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -208,14 +188,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -229,19 +206,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -251,27 +223,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -280,9 +240,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -289,16 +247,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -305,11 +259,7 @@
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@
@@ -318,11 +268,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -356,7 +302,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -366,9 +312,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1rawafm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1rawafm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/t1rawafm/Makefile
+ $(AUTOMAKE) --foreign t1rawafm/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -396,7 +342,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -411,8 +356,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -428,13 +373,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
t1rawafm$(EXEEXT): $(t1rawafm_OBJECTS) $(t1rawafm_DEPENDENCIES) $(EXTRA_t1rawafm_DEPENDENCIES)
@rm -f t1rawafm$(EXEEXT)
@@ -449,34 +388,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t1rawafm.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -643,7 +566,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -698,8 +621,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -716,18 +638,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/t1rawafm.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/t1rawafm.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/t1rawafm.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,4 +1,4 @@
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/t1rawafm.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/t1rawafm.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/t1rawafm.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* t1rawafm.cc -- driver for generating a raw AFM file from a font
*
- * Copyright (c) 2008-2013 Eddie Kohler
+ * Copyright (c) 2008-2016 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
@@ -66,7 +66,7 @@
if (!error_message)
errh->message("Usage: %s [OPTION]... [FONT [OUTPUT]]", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -315,7 +315,7 @@
case VERSION_OPT:
printf("t1rawafm (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2008-2013 Eddie Kohler\n\
+ printf("Copyright (C) 2008-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = t1reencode$(EXEEXT)
-subdir = lcdf-typetools-src/t1reencode
+subdir = t1reencode
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -115,10 +103,6 @@
am_t1reencode_OBJECTS = t1reencode.$(OBJEXT) util.$(OBJEXT)
t1reencode_OBJECTS = $(am_t1reencode_OBJECTS)
t1reencode_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -132,22 +116,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -154,18 +134,12 @@
am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
@@ -226,14 +200,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -247,19 +218,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -269,27 +235,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -298,9 +252,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -307,16 +259,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -323,11 +271,7 @@
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@
@@ -336,11 +280,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -376,7 +316,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -386,9 +326,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1reencode/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1reencode/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/t1reencode/Makefile
+ $(AUTOMAKE) --foreign t1reencode/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -416,7 +356,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -431,8 +370,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -448,13 +387,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
t1reencode$(EXEEXT): $(t1reencode_OBJECTS) $(t1reencode_DEPENDENCIES) $(EXTRA_t1reencode_DEPENDENCIES)
@rm -f t1reencode$(EXEEXT)
@@ -470,34 +403,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/util.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -664,7 +581,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -719,8 +636,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -737,18 +653,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/t1reencode.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/t1reencode.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/t1reencode.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,4 +1,4 @@
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/t1reencode.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/t1reencode.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/t1reencode.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* t1reencode.cc -- driver for reencoding Type 1 fonts
*
- * Copyright (c) 2005-2013 Eddie Kohler
+ * Copyright (c) 2005-2016 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
@@ -631,7 +631,7 @@
if (!error_message)
errh->message("Usage: %s [OPTION]... FONT", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -978,7 +978,7 @@
case VERSION_OPT:
printf("t1reencode (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1999-2013 Eddie Kohler\n\
+ printf("Copyright (C) 1999-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/util.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/util.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/util.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* util.{cc,hh} -- various bits
*
- * Copyright (c) 2003-2010 Eddie Kohler
+ * Copyright (c) 2003-2016 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
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = t1testpage$(EXEEXT)
-subdir = lcdf-typetools-src/t1testpage
+subdir = t1testpage
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -115,10 +103,6 @@
am_t1testpage_OBJECTS = t1testpage.$(OBJEXT)
t1testpage_OBJECTS = $(am_t1testpage_OBJECTS)
t1testpage_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -132,22 +116,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -208,14 +188,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -229,19 +206,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -251,27 +223,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -280,9 +240,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -289,16 +247,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -305,11 +259,7 @@
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@
@@ -318,11 +268,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -356,7 +302,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -366,9 +312,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1testpage/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t1testpage/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/t1testpage/Makefile
+ $(AUTOMAKE) --foreign t1testpage/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -396,7 +342,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -411,8 +356,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -428,13 +373,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
t1testpage$(EXEEXT): $(t1testpage_OBJECTS) $(t1testpage_DEPENDENCIES) $(EXTRA_t1testpage_DEPENDENCIES)
@rm -f t1testpage$(EXEEXT)
@@ -449,34 +388,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t1testpage.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -643,7 +566,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -698,8 +621,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -716,18 +638,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/t1testpage.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/t1testpage.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/t1testpage.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,4 +1,4 @@
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/t1testpage.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/t1testpage.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/t1testpage.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* t1testpage.cc -- driver for generating Type 1 fonts' test pages
*
- * Copyright (c) 1999-2013 Eddie Kohler
+ * Copyright (c) 1999-2016 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
@@ -70,7 +70,7 @@
if (!error_message)
errh->message("Usage: %s [OPTION]... FONT", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -624,7 +624,7 @@
case VERSION_OPT:
printf("t1testpage (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 1999-2013 Eddie Kohler\n\
+ printf("Copyright (C) 1999-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/Makefile.in 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/Makefile.in 2016-06-22 06:25:09 UTC (rev 41518)
@@ -86,23 +86,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
bin_PROGRAMS = ttftotype42$(EXEEXT)
-subdir = lcdf-typetools-src/ttftotype42
+subdir = ttftotype42
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
- $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/../../m4/kpse-win32.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)/version.ac \
- $(top_srcdir)/ac/lcdf-typetools.ac $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/lcdf-typetools.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -115,10 +103,6 @@
am_ttftotype42_OBJECTS = ttftotype42.$(OBJEXT)
ttftotype42_OBJECTS = $(am_ttftotype42_OBJECTS)
ttftotype42_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -132,22 +116,18 @@
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
@@ -208,14 +188,11 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -229,19 +206,14 @@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -251,27 +223,15 @@
KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LCDF_TYPETOOLS_TREE = @LCDF_TYPETOOLS_TREE@
-LCDF_TYPETOOLS_VERSION = @LCDF_TYPETOOLS_VERSION@
-LD = @LD@
+KPATHSEA_RULE = @KPATHSEA_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
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@
@@ -280,9 +240,7 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SELECTED_SUBDIRS = @SELECTED_SUBDIRS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -289,16 +247,12 @@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
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@
@@ -305,11 +259,7 @@
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@
@@ -318,11 +268,7 @@
encdir = @encdir@
exec_prefix = @exec_prefix@
glyphlistdir = @glyphlistdir@
-host = @host@
host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -356,7 +302,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -366,9 +312,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/ttftotype42/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ttftotype42/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-src/ttftotype42/Makefile
+ $(AUTOMAKE) --foreign ttftotype42/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -396,7 +342,6 @@
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p \
- || test -f $$p1 \
; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' \
@@ -411,8 +356,8 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
@@ -428,13 +373,7 @@
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
ttftotype42$(EXEEXT): $(ttftotype42_OBJECTS) $(ttftotype42_DEPENDENCIES) $(EXTRA_ttftotype42_DEPENDENCIES)
@rm -f ttftotype42$(EXEEXT)
@@ -449,34 +388,18 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ttftotype42.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
@@ -643,7 +566,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -698,8 +621,7 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
@@ -716,18 +638,17 @@
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am 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 tags-am uninstall uninstall-am \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ 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 tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-man uninstall-man1
.PRECIOUS: Makefile
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/ttftotype42.1
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/ttftotype42.1 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/ttftotype42.1 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,4 +1,4 @@
-.ds V 2.105
+.ds V 2.106
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Modified: trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/ttftotype42.cc
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/ttftotype42.cc 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/ttftotype42.cc 2016-06-22 06:25:09 UTC (rev 41518)
@@ -1,6 +1,6 @@
/* ttftotype42.cc -- driver for translating TrueType fonts to Type 42 fonts
*
- * Copyright (c) 2006-2013 Eddie Kohler
+ * Copyright (c) 2006-2016 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
@@ -67,7 +67,7 @@
if (!error_message)
errh->message("Usage: %s [OPTIONS] [FONTFILE [OUTPUTFILE]]", program_name);
else
- errh->vxmessage(ErrorHandler::e_error, error_message, val);
+ errh->xmessage(ErrorHandler::e_error, error_message, val);
errh->message("Type %s --help for more information.", program_name);
exit(1);
}
@@ -355,7 +355,7 @@
case VERSION_OPT:
printf("ttftotype42 (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2006-2014 Eddie Kohler\n\
+ printf("Copyright (C) 2006-2016 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");
Modified: trunk/Build/source/texk/lcdf-typetools/version.ac
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/version.ac 2016-06-22 01:15:00 UTC (rev 41517)
+++ trunk/Build/source/texk/lcdf-typetools/version.ac 2016-06-22 06:25:09 UTC (rev 41518)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current lcdf-typetools version
-m4_define([lcdf_typetools_version], [2.105])
+m4_define([lcdf_typetools_version], [2.106])
More information about the tex-live-commits
mailing list