summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-02-17 19:29:39 +0000
committerKarl Berry <karl@freefriends.org>2008-02-17 19:29:39 +0000
commitfc3b5d4d4f684baa6216685a0696efb853141529 (patch)
tree0694ed01c09b3c97fcd64453e2c1f647a3fb31ad /Build/source
parent5fc0a693ca037d37d815b00c49660c138b332224 (diff)
move lcdf-typetools to texk and update to 2.66
git-svn-id: svn://tug.org/texlive/trunk@6662 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-xBuild/source/configure78
-rw-r--r--Build/source/configure.in1
-rw-r--r--Build/source/texk/README3
-rwxr-xr-xBuild/source/texk/configure1927
-rw-r--r--Build/source/texk/configure.in1
-rw-r--r--Build/source/texk/lcdf-typetools/7t.enc (renamed from Build/source/utils/lcdf-typetools/7t.enc)0
-rw-r--r--Build/source/texk/lcdf-typetools/COPYING (renamed from Build/source/utils/lcdf-typetools/COPYING)0
-rw-r--r--Build/source/texk/lcdf-typetools/INSTALL (renamed from Build/source/utils/lcdf-typetools/INSTALL)0
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.am (renamed from Build/source/utils/lcdf-typetools/Makefile.am)1
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.in (renamed from Build/source/utils/lcdf-typetools/Makefile.in)1
-rw-r--r--Build/source/texk/lcdf-typetools/NEWS (renamed from Build/source/utils/lcdf-typetools/NEWS)115
-rw-r--r--Build/source/texk/lcdf-typetools/ONEWS (renamed from Build/source/utils/lcdf-typetools/ONEWS)0
-rw-r--r--Build/source/texk/lcdf-typetools/README (renamed from Build/source/utils/lcdf-typetools/README)2
-rw-r--r--Build/source/texk/lcdf-typetools/aclocal.m4 (renamed from Build/source/utils/lcdf-typetools/aclocal.m4)0
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/Makefile.am (renamed from Build/source/utils/lcdf-typetools/cfftot1/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/Makefile.in (renamed from Build/source/utils/lcdf-typetools/cfftot1/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 (renamed from Build/source/utils/lcdf-typetools/cfftot1/cfftot1.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc (renamed from Build/source/utils/lcdf-typetools/cfftot1/cfftot1.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc (renamed from Build/source/utils/lcdf-typetools/cfftot1/maket1font.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/maket1font.hh (renamed from Build/source/utils/lcdf-typetools/cfftot1/maket1font.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/config.h.in (renamed from Build/source/utils/lcdf-typetools/config.h.in)0
-rwxr-xr-xBuild/source/texk/lcdf-typetools/configure (renamed from Build/source/utils/lcdf-typetools/configure)2
-rw-r--r--Build/source/texk/lcdf-typetools/configure.in (renamed from Build/source/utils/lcdf-typetools/configure.in)2
-rwxr-xr-x[-rw-r--r--]Build/source/texk/lcdf-typetools/depcomp (renamed from Build/source/utils/lcdf-typetools/depcomp)0
-rw-r--r--Build/source/texk/lcdf-typetools/glyphlist.txt (renamed from Build/source/utils/lcdf-typetools/glyphlist.txt)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/afm.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/afm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/afmparse.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/afmparse.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/afmw.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/afmw.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/amfm.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/amfm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/cff.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/cff.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/encoding.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/encoding.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/findmet.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/findmet.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/metrics.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/metrics.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/otf.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/otf.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/otfcmap.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/otfcmap.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/otfdata.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/otfdata.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/otfgpos.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/otfgpos.hh)6
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/otfgsub.hh)6
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/otfname.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/otfname.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/otfos2.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/otfos2.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/otfpost.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/otfpost.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/pairop.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/pairop.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/psres.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/psres.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/t1bounds.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/t1bounds.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/t1cs.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/t1cs.hh)3
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/t1csgen.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/t1csgen.hh)2
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/t1font.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/t1font.hh)2
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/t1interp.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/t1interp.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/t1item.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/t1item.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/t1mm.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/t1mm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/t1rw.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/t1rw.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/t1unparser.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/t1unparser.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/ttfcs.hh (renamed from Build/source/utils/lcdf-typetools/include/efont/ttfcs.hh)4
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/ttfhead.hh41
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/bezier.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/bezier.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/clp.h (renamed from Build/source/utils/lcdf-typetools/include/lcdf/clp.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/error.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/error.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/filename.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/filename.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/globmatch.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/globmatch.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/hashmap.cc (renamed from Build/source/utils/lcdf-typetools/include/lcdf/hashmap.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/hashmap.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/hashmap.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/inttypes.h (renamed from Build/source/utils/lcdf-typetools/include/lcdf/inttypes.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/landmark.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/landmark.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/md5.h (renamed from Build/source/utils/lcdf-typetools/include/lcdf/md5.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/permstr.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/permstr.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/point.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/point.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/slurper.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/slurper.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/straccum.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/string.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/string.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/strtonum.h (renamed from Build/source/utils/lcdf-typetools/include/lcdf/strtonum.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/transform.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/transform.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/vector.cc (renamed from Build/source/utils/lcdf-typetools/include/lcdf/vector.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/vector.hh (renamed from Build/source/utils/lcdf-typetools/include/lcdf/vector.hh)0
-rwxr-xr-xBuild/source/texk/lcdf-typetools/install-sh (renamed from Build/source/utils/lcdf-typetools/install-sh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools.spec (renamed from Build/source/utils/lcdf-typetools/lcdf-typetools.spec)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/Makefile.am (renamed from Build/source/utils/lcdf-typetools/libefont/Makefile.am)3
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/Makefile.in (renamed from Build/source/utils/lcdf-typetools/libefont/Makefile.in)7
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/afm.cc (renamed from Build/source/utils/lcdf-typetools/libefont/afm.cc)4
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/afmparse.cc (renamed from Build/source/utils/lcdf-typetools/libefont/afmparse.cc)2
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/afmw.cc (renamed from Build/source/utils/lcdf-typetools/libefont/afmw.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/amfm.cc (renamed from Build/source/utils/lcdf-typetools/libefont/amfm.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/cff.cc (renamed from Build/source/utils/lcdf-typetools/libefont/cff.cc)9
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/encoding.cc (renamed from Build/source/utils/lcdf-typetools/libefont/encoding.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/findmet.cc (renamed from Build/source/utils/lcdf-typetools/libefont/findmet.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/metrics.cc (renamed from Build/source/utils/lcdf-typetools/libefont/metrics.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otf.cc (renamed from Build/source/utils/lcdf-typetools/libefont/otf.cc)23
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfcmap.cc (renamed from Build/source/utils/lcdf-typetools/libefont/otfcmap.cc)19
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfdata.cc (renamed from Build/source/utils/lcdf-typetools/libefont/otfdata.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc (renamed from Build/source/utils/lcdf-typetools/libefont/otfdescrip.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfgpos.cc (renamed from Build/source/utils/lcdf-typetools/libefont/otfgpos.cc)33
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfgsub.cc (renamed from Build/source/utils/lcdf-typetools/libefont/otfgsub.cc)45
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfname.cc (renamed from Build/source/utils/lcdf-typetools/libefont/otfname.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfos2.cc (renamed from Build/source/utils/lcdf-typetools/libefont/otfos2.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfpost.cc (renamed from Build/source/utils/lcdf-typetools/libefont/otfpost.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/pairop.cc (renamed from Build/source/utils/lcdf-typetools/libefont/pairop.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/psres.cc (renamed from Build/source/utils/lcdf-typetools/libefont/psres.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1bounds.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1bounds.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1cs.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1cs.cc)6
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1csgen.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1csgen.cc)26
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1font.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1font.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1fontskel.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1fontskel.cc)31
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1interp.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1interp.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1item.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1item.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1mm.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1mm.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1rw.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1rw.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1unparser.cc (renamed from Build/source/utils/lcdf-typetools/libefont/t1unparser.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/ttfcs.cc (renamed from Build/source/utils/lcdf-typetools/libefont/ttfcs.cc)51
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/ttfhead.cc69
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/Makefile.am (renamed from Build/source/utils/lcdf-typetools/liblcdf/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/Makefile.in (renamed from Build/source/utils/lcdf-typetools/liblcdf/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/bezier.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/bezier.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/clp.c (renamed from Build/source/utils/lcdf-typetools/liblcdf/clp.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/error.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/error.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/filename.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/filename.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c (renamed from Build/source/utils/lcdf-typetools/liblcdf/fixlibc.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/globmatch.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/globmatch.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/landmark.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/landmark.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/md5.c (renamed from Build/source/utils/lcdf-typetools/liblcdf/md5.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/permstr.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/permstr.cc)15
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/point.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/point.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/slurper.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/slurper.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/straccum.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/straccum.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/string.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/string.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/strtonum.c (renamed from Build/source/utils/lcdf-typetools/liblcdf/strtonum.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/transform.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/transform.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/vectorv.cc (renamed from Build/source/utils/lcdf-typetools/liblcdf/vectorv.cc)0
-rwxr-xr-x[-rw-r--r--]Build/source/texk/lcdf-typetools/missing (renamed from Build/source/utils/lcdf-typetools/missing)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmafm/Makefile.am (renamed from Build/source/utils/lcdf-typetools/mmafm/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmafm/Makefile.in (renamed from Build/source/utils/lcdf-typetools/mmafm/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmafm/main.cc (renamed from Build/source/utils/lcdf-typetools/mmafm/main.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmafm/mmafm.1 (renamed from Build/source/utils/lcdf-typetools/mmafm/mmafm.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/Makefile.am (renamed from Build/source/utils/lcdf-typetools/mmpfb/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/Makefile.in (renamed from Build/source/utils/lcdf-typetools/mmpfb/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/main.cc (renamed from Build/source/utils/lcdf-typetools/mmpfb/main.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 (renamed from Build/source/utils/lcdf-typetools/mmpfb/mmpfb.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/myfont.cc (renamed from Build/source/utils/lcdf-typetools/mmpfb/myfont.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/myfont.hh (renamed from Build/source/utils/lcdf-typetools/mmpfb/myfont.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/t1minimize.cc (renamed from Build/source/utils/lcdf-typetools/mmpfb/t1minimize.cc)8
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/t1minimize.hh (renamed from Build/source/utils/lcdf-typetools/mmpfb/t1minimize.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.cc (renamed from Build/source/utils/lcdf-typetools/mmpfb/t1rewrit.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.hh (renamed from Build/source/utils/lcdf-typetools/mmpfb/t1rewrit.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/otfinfo/Makefile.am (renamed from Build/source/utils/lcdf-typetools/otfinfo/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/otfinfo/Makefile.in (renamed from Build/source/utils/lcdf-typetools/otfinfo/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 (renamed from Build/source/utils/lcdf-typetools/otfinfo/otfinfo.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc (renamed from Build/source/utils/lcdf-typetools/otfinfo/otfinfo.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/Makefile.am (renamed from Build/source/utils/lcdf-typetools/otftotfm/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/Makefile.in (renamed from Build/source/utils/lcdf-typetools/otftotfm/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/automatic.cc (renamed from Build/source/utils/lcdf-typetools/otftotfm/automatic.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/automatic.hh (renamed from Build/source/utils/lcdf-typetools/otftotfm/automatic.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc (renamed from Build/source/utils/lcdf-typetools/otftotfm/dvipsencoding.cc)29
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.hh (renamed from Build/source/utils/lcdf-typetools/otftotfm/dvipsencoding.hh)11
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc (renamed from Build/source/utils/lcdf-typetools/otftotfm/glyphfilter.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.hh (renamed from Build/source/utils/lcdf-typetools/otftotfm/glyphfilter.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.c (renamed from Build/source/utils/lcdf-typetools/otftotfm/kpseinterface.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.h (renamed from Build/source/utils/lcdf-typetools/otftotfm/kpseinterface.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/metrics.cc (renamed from Build/source/utils/lcdf-typetools/otftotfm/metrics.cc)230
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/metrics.hh (renamed from Build/source/utils/lcdf-typetools/otftotfm/metrics.hh)36
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 (renamed from Build/source/utils/lcdf-typetools/otftotfm/otftotfm.1)51
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc (renamed from Build/source/utils/lcdf-typetools/otftotfm/otftotfm.cc)314
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/otftotfm.hh (renamed from Build/source/utils/lcdf-typetools/otftotfm/otftotfm.hh)2
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/secondary.cc (renamed from Build/source/utils/lcdf-typetools/otftotfm/secondary.cc)137
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/secondary.hh (renamed from Build/source/utils/lcdf-typetools/otftotfm/secondary.hh)4
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/uniprop.cc (renamed from Build/source/utils/lcdf-typetools/otftotfm/uniprop.cc)297
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/uniprop.hh (renamed from Build/source/utils/lcdf-typetools/otftotfm/uniprop.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/util.cc (renamed from Build/source/utils/lcdf-typetools/otftotfm/util.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/util.hh (renamed from Build/source/utils/lcdf-typetools/otftotfm/util.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.am (renamed from Build/source/utils/lcdf-typetools/t1dotlessj/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in (renamed from Build/source/utils/lcdf-typetools/t1dotlessj/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 (renamed from Build/source/utils/lcdf-typetools/t1dotlessj/t1dotlessj.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc (renamed from Build/source/utils/lcdf-typetools/t1dotlessj/t1dotlessj.cc)5
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/Makefile.am (renamed from Build/source/utils/lcdf-typetools/t1lint/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/Makefile.in (renamed from Build/source/utils/lcdf-typetools/t1lint/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/cscheck.cc (renamed from Build/source/utils/lcdf-typetools/t1lint/cscheck.cc)7
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/cscheck.hh (renamed from Build/source/utils/lcdf-typetools/t1lint/cscheck.hh)2
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/t1lint.1 (renamed from Build/source/utils/lcdf-typetools/t1lint/t1lint.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/t1lint.cc (renamed from Build/source/utils/lcdf-typetools/t1lint/t1lint.cc)12
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/Makefile.am (renamed from Build/source/utils/lcdf-typetools/t1reencode/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/Makefile.in (renamed from Build/source/utils/lcdf-typetools/t1reencode/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/md5.c (renamed from Build/source/utils/lcdf-typetools/t1reencode/md5.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/md5.h (renamed from Build/source/utils/lcdf-typetools/t1reencode/md5.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 (renamed from Build/source/utils/lcdf-typetools/t1reencode/t1reencode.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc (renamed from Build/source/utils/lcdf-typetools/t1reencode/t1reencode.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/util.cc (renamed from Build/source/utils/lcdf-typetools/t1reencode/util.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/util.hh (renamed from Build/source/utils/lcdf-typetools/t1reencode/util.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1testpage/Makefile.am (renamed from Build/source/utils/lcdf-typetools/t1testpage/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1testpage/Makefile.in (renamed from Build/source/utils/lcdf-typetools/t1testpage/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 (renamed from Build/source/utils/lcdf-typetools/t1testpage/t1testpage.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc (renamed from Build/source/utils/lcdf-typetools/t1testpage/t1testpage.cc)5
-rw-r--r--Build/source/texk/lcdf-typetools/texglyphlist.txt (renamed from Build/source/utils/lcdf-typetools/texglyphlist.txt)0
-rw-r--r--Build/source/texk/lcdf-typetools/ttftotype42/Makefile.am (renamed from Build/source/utils/lcdf-typetools/ttftotype42/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in (renamed from Build/source/utils/lcdf-typetools/ttftotype42/Makefile.in)0
-rw-r--r--Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 (renamed from Build/source/utils/lcdf-typetools/ttftotype42/ttftotype42.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc (renamed from Build/source/utils/lcdf-typetools/ttftotype42/ttftotype42.cc)12
-rw-r--r--Build/source/texk/withenable.ac58
-rw-r--r--Build/source/utils/README3
-rw-r--r--Build/source/withenable.ac3
196 files changed, 2196 insertions, 1588 deletions
diff --git a/Build/source/configure b/Build/source/configure
index b37f63cb1cf..39f09b6bdcf 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -758,7 +758,6 @@ CPP
XMKMF'
ac_subdirs_all='libs
utils/dialog
-utils/lcdf-typetools
utils/mkjobtexmf
utils/pdfopen
utils/ps2eps
@@ -1366,7 +1365,6 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-x use the X Window System
--without-dialog do not build the dialog package
- --without-lcdf-typetools do not build the lcdf-typetools package
--without-mkjobtexmf do not build the mkjobtexmf package
--without-pdfopen do not build the pdfopen package
--without-ps2eps do not build the ps2eps package
@@ -1377,34 +1375,35 @@ Optional Packages:
--without-texi2html do not build the texi2html package
--without-texinfo do not build the texinfo package
--without-tpic2pdftex do not build the tpic2pdftex package
- --without-afm2pl do not build the afm2pl package
- --without-bibtex8 do not build the bibtex8 package
- --without-cjkutils do not build the cjkutils package
- --without-detex do not build the detex package
- --without-devnag do not build the devnag package
- --without-dtl do not build the dtl package
- --without-dvi2tty do not build the dvi2tty package
- --without-dvidvi do not build the dvidvi package
- --without-dviljk do not build the dviljk package
- --without-dvipdfm do not build the dvipdfm package
- --without-dvipdfmx do not build the dvipdfmx package
- --without-dvipng do not build the dvipng package
- --without-dvipos do not build the dvipos package
- --without-dvipsk do not build the dvipsk package
- --without-gsftopk do not build the gsftopk package
- --without-lacheck do not build the lacheck package
- --without-makeindexk do not build the makeindexk package
- --without-musixflx do not build the musixflx package
- --without-ps2pkm do not build the ps2pkm package
- --without-seetexk do not build the seetexk package
- --without-tetex do not build the tetex package
- --without-tex4htk do not build the tex4htk package
- --without-texlive do not build the texlive package
- --without-ttf2pk do not build the ttf2pk package
- --without-tth do not build the tth package
- --without-xdvik do not build the xdvik package
- --without-xdvipdfmx do not build the xdvipdfmx package
- --without-xdv2pdf do not build the xdv2pdf package
+ --without-afm2pl do not build the afm2pl package
+ --without-bibtex8 do not build the bibtex8 package
+ --without-cjkutils do not build the cjkutils package
+ --without-detex do not build the detex package
+ --without-devnag do not build the devnag package
+ --without-dtl do not build the dtl package
+ --without-dvi2tty do not build the dvi2tty package
+ --without-dvidvi do not build the dvidvi package
+ --without-dviljk do not build the dviljk package
+ --without-dvipdfm do not build the dvipdfm package
+ --without-dvipdfmx do not build the dvipdfmx package
+ --without-dvipng do not build the dvipng package
+ --without-dvipos do not build the dvipos package
+ --without-dvipsk do not build the dvipsk package
+ --without-gsftopk do not build the gsftopk package
+ --without-lacheck do not build the lacheck package
+ --without-lcdf-typetools do not build the lcdf-typetools package
+ --without-makeindexk do not build the makeindexk package
+ --without-musixflx do not build the musixflx package
+ --without-ps2pkm do not build the ps2pkm package
+ --without-seetexk do not build the seetexk package
+ --without-tetex do not build the tetex package
+ --without-tex4htk do not build the tex4htk package
+ --without-texlive do not build the texlive package
+ --without-ttf2pk do not build the ttf2pk package
+ --without-tth do not build the tth package
+ --without-xdvik do not build the xdvik package
+ --without-xdvipdfmx do not build the xdvipdfmx package
+ --without-xdv2pdf do not build the xdv2pdf package
--with-x-toolkit=KIT OBSOLETE: use --with-mf-x-toolkit and/or
--with-xdvi-x-toolkit instead.
--without-mktexmf-default do not run mktexmf if MF source missing
@@ -5325,13 +5324,6 @@ fi
-# Check whether --with-lcdf-typetools was given.
-if test "${with_lcdf_typetools+set}" = set; then
- withval=$with_lcdf_typetools;
-fi
-
-
-
# Check whether --with-mkjobtexmf was given.
if test "${with_mkjobtexmf+set}" = set; then
withval=$with_mkjobtexmf;
@@ -5500,6 +5492,12 @@ if test "${with_lacheck+set}" = set; then
fi
+# Check whether --with-lcdf-typetools was given.
+if test "${with_lcdf_typetools+set}" = set; then
+ withval=$with_lcdf_typetools;
+fi
+
+
# Check whether --with-makeindexk was given.
if test "${with_makeindexk+set}" = set; then
withval=$with_makeindexk;
@@ -9349,12 +9347,6 @@ if test -d $srcdir/utils/dialog; then
subdirs="$subdirs utils/dialog"
fi
fi
-if test -d $srcdir/utils/lcdf-typetools; then
- if test "x$with_lcdf_typetools" != xno; then
- ESUBDIRS="$ESUBDIRS utils/lcdf-typetools"
- subdirs="$subdirs utils/lcdf-typetools"
- fi
-fi
if test -d $srcdir/utils/mkjobtexmf; then
if test "x$with_mkjobtexmf" != xno; then
ESUBDIRS="$ESUBDIRS utils/mkjobtexmf"
diff --git a/Build/source/configure.in b/Build/source/configure.in
index 95a7debace2..ea1e9bb8a46 100644
--- a/Build/source/configure.in
+++ b/Build/source/configure.in
@@ -260,7 +260,6 @@ AC_CONFIG_SUBDIRS([libs])
KPSE_CONFIG_SUBDIRS([
dialog
- lcdf-typetools
mkjobtexmf
pdfopen
ps2eps
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 39ef160ff0b..063cef1b919 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -28,5 +28,8 @@ dvipng 1.9 - ok 5dec06
dvi2tty 5.3.1 - needs update 18may07
http://www.mesa.nl/pub/dvi2tty/
+lcdf-typetools 2.66 - ok 17feb08
+ http://www.lcdf.org/type/
+
xdvik 22.84.10 - ok 4dec06
http://xdvi.sourceforge.net/
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 9d81a45f970..aa3ce895b92 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61a.
+# Generated by GNU Autoconf 2.61.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -37,38 +37,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
echo "#! /bin/sh" >conf$$.sh
@@ -95,6 +63,8 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
+as_nl='
+'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -117,7 +87,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -162,7 +132,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -481,7 +451,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -509,6 +479,7 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -904,6 +875,7 @@ dvipos
dvipsk
gsftopk
lacheck
+lcdf-typetools
makeindexk
musixflx
ps2pkm
@@ -1018,13 +990,13 @@ do
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-.]/_/g'`
- eval enable_$ac_useropt=no ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -1037,13 +1009,13 @@ do
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-.]/_/g'`
- eval enable_$ac_useropt=\$ac_optarg ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1234,22 +1206,22 @@ do
ac_init_version=: ;;
-with-* | --with-*)
- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-.]/_/g'`
- eval with_$ac_useropt=\$ac_optarg ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-.]/_/g'`
- eval with_$ac_useropt=no ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=no ;;
--x)
# Obsolete; use --with-x.
@@ -1269,7 +1241,7 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
@@ -1278,16 +1250,16 @@ Try \`$0 --help' for more information." >&2
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@ -1296,7 +1268,7 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+ { echo "$as_me: error: missing argument to $ac_option" >&2
{ (exit 1); exit 1; }; }
fi
@@ -1311,7 +1283,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
{ (exit 1); exit 1; }; }
done
@@ -1326,7 +1298,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -1342,10 +1314,10 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+ { echo "$as_me: error: Working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+ { echo "$as_me: error: pwd does not report name of working directory" >&2
{ (exit 1); exit 1; }; }
@@ -1358,7 +1330,7 @@ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$0" : 'X\(//\)[^/]' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$0" |
+echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1385,12 +1357,12 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
@@ -1509,34 +1481,35 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --without-afm2pl do not build the afm2pl package
- --without-bibtex8 do not build the bibtex8 package
- --without-cjkutils do not build the cjkutils package
- --without-detex do not build the detex package
- --without-devnag do not build the devnag package
- --without-dtl do not build the dtl package
- --without-dvi2tty do not build the dvi2tty package
- --without-dvidvi do not build the dvidvi package
- --without-dviljk do not build the dviljk package
- --without-dvipdfm do not build the dvipdfm package
- --without-dvipdfmx do not build the dvipdfmx package
- --without-dvipng do not build the dvipng package
- --without-dvipos do not build the dvipos package
- --without-dvipsk do not build the dvipsk package
- --without-gsftopk do not build the gsftopk package
- --without-lacheck do not build the lacheck package
- --without-makeindexk do not build the makeindexk package
- --without-musixflx do not build the musixflx package
- --without-ps2pkm do not build the ps2pkm package
- --without-seetexk do not build the seetexk package
- --without-tetex do not build the tetex package
- --without-tex4htk do not build the tex4htk package
- --without-texlive do not build the texlive package
- --without-ttf2pk do not build the ttf2pk package
- --without-tth do not build the tth package
- --without-xdvik do not build the xdvik package
- --without-xdvipdfmx do not build the xdvipdfmx package
- --without-xdv2pdf do not build the xdv2pdf package
+ --without-afm2pl do not build the afm2pl package
+ --without-bibtex8 do not build the bibtex8 package
+ --without-cjkutils do not build the cjkutils package
+ --without-detex do not build the detex package
+ --without-devnag do not build the devnag package
+ --without-dtl do not build the dtl package
+ --without-dvi2tty do not build the dvi2tty package
+ --without-dvidvi do not build the dvidvi package
+ --without-dviljk do not build the dviljk package
+ --without-dvipdfm do not build the dvipdfm package
+ --without-dvipdfmx do not build the dvipdfmx package
+ --without-dvipng do not build the dvipng package
+ --without-dvipos do not build the dvipos package
+ --without-dvipsk do not build the dvipsk package
+ --without-gsftopk do not build the gsftopk package
+ --without-lacheck do not build the lacheck package
+ --without-lcdf-typetools do not build the lcdf-typetools package
+ --without-makeindexk do not build the makeindexk package
+ --without-musixflx do not build the musixflx package
+ --without-ps2pkm do not build the ps2pkm package
+ --without-seetexk do not build the seetexk package
+ --without-tetex do not build the tetex package
+ --without-tex4htk do not build the tex4htk package
+ --without-texlive do not build the texlive package
+ --without-ttf2pk do not build the ttf2pk package
+ --without-tth do not build the tth package
+ --without-xdvik do not build the xdvik package
+ --without-xdvipdfmx do not build the xdvipdfmx package
+ --without-xdv2pdf do not build the xdv2pdf package
--without-mktexmf-default do not run mktexmf if MF source missing
--without-mktexpk-default do not run mktexpk if PK font missing
--without-mktextfm-default do not run mktextfm if TFM file missing
@@ -1598,9 +1571,9 @@ if test "$ac_init_help" = "recursive"; then
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1636,7 +1609,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1646,7 +1619,7 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.61a
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1660,7 +1633,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.61a. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1696,7 +1669,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
+ echo "PATH: $as_dir"
done
IFS=$as_save_IFS
@@ -1731,7 +1704,7 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1783,12 +1756,11 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -1818,9 +1790,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -1835,9 +1807,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1853,8 +1825,8 @@ _ASBOX
echo
fi
test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1909,8 +1881,8 @@ shift
for ac_site_file
do
if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1920,16 +1892,16 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1943,29 +1915,29 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { $as_echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-$as_echo "$as_me: former value: $ac_old_val" >&2;}
- { $as_echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-$as_echo "$as_me: current value: $ac_new_val" >&2;}
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+echo "$as_me: former value: $ac_old_val" >&2;}
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1975,10 +1947,10 @@ $as_echo "$as_me: current value: $ac_new_val" >&2;}
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2008,12 +1980,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -2030,12 +2001,12 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2048,10 +2019,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2064,7 +2035,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2075,11 +2046,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2088,10 +2059,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2104,7 +2075,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2115,11 +2086,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -2127,10 +2098,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
@@ -2145,10 +2116,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2161,7 +2132,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2172,11 +2143,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2185,10 +2156,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2206,7 +2177,7 @@ do
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2229,11 +2200,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2244,10 +2215,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2260,7 +2231,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2271,11 +2242,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2288,10 +2259,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2304,7 +2275,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2315,11 +2286,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2331,10 +2302,10 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
@@ -2346,48 +2317,44 @@ fi
fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
@@ -2410,9 +2377,9 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
#
# List of possible output files, starting from the most likely.
# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
@@ -2437,11 +2404,10 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2479,15 +2445,15 @@ else
ac_file=''
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
if test -z "$ac_file"; then
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
+echo "$as_me: error: C compiler cannot create executables
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
fi
@@ -2496,8 +2462,8 @@ ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
@@ -2506,51 +2472,49 @@ if test "$cross_compiling" != yes; then
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
+echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
rm -f a.out a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -2566,24 +2530,24 @@ for ac_file in conftest.exe conftest conftest.*; do
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
if test "${ac_cv_objext+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -2606,11 +2570,10 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
@@ -2621,26 +2584,26 @@ $as_echo "$ac_try_echo") >&5
esac
done
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -2666,21 +2629,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -2690,19 +2652,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
@@ -2729,21 +2687,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
@@ -2768,21 +2725,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2808,21 +2764,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2837,8 +2792,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -2854,10 +2809,10 @@ else
CFLAGS=
fi
fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
if test "${ac_cv_prog_cc_c89+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
@@ -2928,21 +2883,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2958,15 +2912,15 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
+ { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
esac
@@ -2977,10 +2931,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
if test "${ac_cv_search_strerror+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
@@ -3018,14 +2972,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -3033,7 +2986,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
ac_cv_search_strerror=$ac_res
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3053,34 +3006,34 @@ fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
ac_res=$ac_cv_search_strerror
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
fi
if test "x$prefix" = xNONE; then
- $as_echo_n "checking for prefix by " >&6
+ echo $ECHO_N "checking for prefix by $ECHO_C" >&6
# Extract the first word of "tex", so it can be a program name with args.
set dummy tex; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_ac_prefix_program+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $ac_prefix_program in
[\\/]* | ?:[\\/]*)
@@ -3095,7 +3048,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_prefix_program="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3107,11 +3060,11 @@ esac
fi
ac_prefix_program=$ac_cv_path_ac_prefix_program
if test -n "$ac_prefix_program"; then
- { $as_echo "$as_me:$LINENO: result: $ac_prefix_program" >&5
-$as_echo "$ac_prefix_program" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_prefix_program" >&5
+echo "${ECHO_T}$ac_prefix_program" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -3121,7 +3074,7 @@ $as_expr X"$ac_prefix_program" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_prefix_program" : 'X\(//\)[^/]' \| \
X"$ac_prefix_program" : 'X\(//\)$' \| \
X"$ac_prefix_program" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_prefix_program" |
+echo X"$ac_prefix_program" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -3144,7 +3097,7 @@ $as_expr X"$prefix" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$prefix" : 'X\(//\)[^/]' \| \
X"$prefix" : 'X\(//\)$' \| \
X"$prefix" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$prefix" |
+echo X"$prefix" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -3183,8 +3136,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
fi
done
if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -3210,11 +3163,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -3266,8 +3219,8 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -3558,6 +3511,12 @@ if test "${with_lacheck+set}" = set; then
fi
+# Check whether --with-lcdf-typetools was given.
+if test "${with_lcdf_typetools+set}" = set; then
+ withval=$with_lcdf_typetools;
+fi
+
+
# Check whether --with-makeindexk was given.
if test "${with_makeindexk+set}" = set; then
withval=$with_makeindexk;
@@ -3631,8 +3590,8 @@ fi
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -3640,8 +3599,8 @@ else
USE_MAINTAINER_MODE=no
fi
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
if test "x$USE_MAINTAINER_MODE" = xyes; then
MAINT=
else
@@ -3650,10 +3609,10 @@ $as_echo "$USE_MAINTAINER_MODE" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
-$as_echo_n "checking for loader (symbol LD)... " >&6; }
+{ echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
+echo $ECHO_N "checking for loader (symbol LD)... $ECHO_C" >&6; }
if test "${cf_cv_subst_LD+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
test -z "$LD" && LD=ld
@@ -3661,14 +3620,14 @@ cf_cv_subst_LD=$LD
fi
LD=${cf_cv_subst_LD}
-{ $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
+{ echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
-$as_echo_n "checking for archiver (symbol AR)... " >&6; }
+{ echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
+echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6; }
if test "${cf_cv_subst_AR+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
test -z "$AR" && AR=ar
@@ -3676,14 +3635,14 @@ cf_cv_subst_AR=$AR
fi
AR=${cf_cv_subst_AR}
-{ $as_echo "$as_me:$LINENO: result: $AR" >&5
-$as_echo "$AR" >&6; }
+{ echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
-$as_echo_n "checking for archiver options (symbol ARFLAGS)... " >&6; }
+{ echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
+echo $ECHO_N "checking for archiver options (symbol ARFLAGS)... $ECHO_C" >&6; }
if test "${cf_cv_subst_ARFLAGS+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
test -z "$ARFLAGS" && ARFLAGS=rc
@@ -3691,8 +3650,8 @@ cf_cv_subst_ARFLAGS=$ARFLAGS
fi
ARFLAGS=${cf_cv_subst_ARFLAGS}
-{ $as_echo "$as_me:$LINENO: result: $ARFLAGS" >&5
-$as_echo "$ARFLAGS" >&6; }
+{ echo "$as_me:$LINENO: result: $ARFLAGS" >&5
+echo "${ECHO_T}$ARFLAGS" >&6; }
@@ -3751,8 +3710,8 @@ else
fi
-{ $as_echo "$as_me:$LINENO: checking where the main texmf tree is located" >&5
-$as_echo_n "checking where the main texmf tree is located... " >&6; }
+{ echo "$as_me:$LINENO: checking where the main texmf tree is located" >&5
+echo $ECHO_N "checking where the main texmf tree is located... $ECHO_C" >&6; }
case $prefix in
*/) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
esac
@@ -3764,12 +3723,12 @@ if test "x$datadir" != 'x${prefix}/share'; then
texmfmain=`echo "$p/texmf" | sed 's,//*,/,g'`
# ... do complain if it wasn't found.
if test -d "$texmfmain"; then
- { $as_echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
-$as_echo "\"$texmfmain\"" >&6; }
+ { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
+echo "${ECHO_T}\"$texmfmain\"" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
- { $as_echo "$as_me:$LINENO: WARNING: No texmf tree found at $texmfmain.
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+ { echo "$as_me:$LINENO: WARNING: No texmf tree found at $texmfmain.
*****************************************************************
* Error: The main texmf tree was not found. *
* If you do not have the files, you should be able to them from *
@@ -3777,7 +3736,7 @@ $as_echo "not found" >&6; }
* CTAN hosts. *
*****************************************************************
Winging it." >&5
-$as_echo "$as_me: WARNING: No texmf tree found at $texmfmain.
+echo "$as_me: WARNING: No texmf tree found at $texmfmain.
*****************************************************************
* Error: The main texmf tree was not found. *
* If you do not have the files, you should be able to them from *
@@ -3806,13 +3765,13 @@ else
fi
texmfmain=`echo "$texmfmain" | sed 's,//*,/,g'`
if test -n "$texmfmain"; then
- { $as_echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
-$as_echo "\"$texmfmain\"" >&6; }
+ { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
+echo "${ECHO_T}\"$texmfmain\"" >&6; }
else
eval texmfmain="$datadir/texmf"
- { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
- { $as_echo "$as_me:$LINENO: WARNING: The main texmf tree was not found at $texmfmain.
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+ { echo "$as_me:$LINENO: WARNING: The main texmf tree was not found at $texmfmain.
*****************************************************************
* Error: The main texmf tree was not found. *
* Use the --datadir option to specify its parent directory. *
@@ -3821,7 +3780,7 @@ $as_echo "not found" >&6; }
* CTAN hosts. *
*****************************************************************
Winging it by pretending $texmfmain is correct." >&5
-$as_echo "$as_me: WARNING: The main texmf tree was not found at $texmfmain.
+echo "$as_me: WARNING: The main texmf tree was not found at $texmfmain.
*****************************************************************
* Error: The main texmf tree was not found. *
* Use the --datadir option to specify its parent directory. *
@@ -3905,10 +3864,10 @@ _ACEOF
# -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too?
# See ac_path_xtra.
- { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
+ { echo "$as_me:$LINENO: checking for connect" >&5
+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
if test "${ac_cv_func_connect+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3961,14 +3920,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -3976,7 +3934,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
ac_cv_func_connect=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_connect=no
@@ -3985,14 +3943,14 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
if test x$ac_cv_func_connect = xno; then
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
if test "${ac_cv_lib_socket_connect+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
@@ -4024,14 +3982,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -4039,7 +3996,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
ac_cv_lib_socket_connect=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_socket_connect=no
@@ -4049,8 +4006,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
if test $ac_cv_lib_socket_connect = yes; then
socketlibs="-lsocket $socketlibs"
fi
@@ -4219,8 +4176,8 @@ if test "${with_mf_x_toolkit+set}" = set; then
y | ye | yes ) val=yes ;;
n | no ) val=no ;;
* )
-{ $as_echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&5
-$as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&2;}
+{ echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&5
+echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&2;}
val=yes;;
esac
with_mf_x_toolkit=$val
@@ -4239,8 +4196,8 @@ if test "${with_ps+set}" = set; then
no) PS_DEF=no;;
dps) PS_DEF="$PS_DEF -DPS_DPS";;
news) PS_DEF="$PS_DEF -DPS_NEWS";;
- *) { $as_echo "$as_me:$LINENO: WARNING: Unknown --with-ps argument \`$withval'; using gs." >&5
-$as_echo "$as_me: WARNING: Unknown --with-ps argument \`$withval'; using gs." >&2;};;
+ *) { echo "$as_me:$LINENO: WARNING: Unknown --with-ps argument \`$withval'; using gs." >&5
+echo "$as_me: WARNING: Unknown --with-ps argument \`$withval'; using gs." >&2;};;
esac
fi
@@ -4403,8 +4360,8 @@ if test "${with_xdvi_x_toolkit+set}" = set; then
x | xa | xaw ) val=xaw ;;
m | mo | mot | moti | motif ) val=motif ;;
* )
-{ $as_echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw." >&5
-$as_echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw." >&2;}
+{ echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw." >&5
+echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw." >&2;}
val=xaw;;
esac
with_xdvi_x_toolkit=$val
@@ -4481,34 +4438,34 @@ fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
{ (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
if test "${ac_cv_build+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
@@ -4525,27 +4482,27 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
if test "${ac_cv_host+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
@@ -4584,8 +4541,8 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+ { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -4614,14 +4571,14 @@ $as_echo_n "checking for ld used by GCC... " >&6; }
;;
esac
elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
else
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
fi
if test "${lt_cv_path_LD+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -4647,19 +4604,19 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -4668,27 +4625,27 @@ else
lt_cv_prog_gnu_ld=no
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
if test "${lt_cv_ld_reload_flag+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_ld_reload_flag='-r'
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
test -n "$reload_flag" && reload_flag=" $reload_flag"
-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-$as_echo_n "checking for BSD-compatible nm... " >&6; }
+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
if test "${lt_cv_path_NM+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$NM"; then
# Let the user override the test.
@@ -4721,13 +4678,13 @@ fi
fi
NM="$lt_cv_path_NM"
-{ $as_echo "$as_me:$LINENO: result: $NM" >&5
-$as_echo "$NM" >&6; }
+{ echo "$as_me:$LINENO: result: $NM" >&5
+echo "${ECHO_T}$NM" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
if test "${lt_cv_path_SED+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
@@ -4806,13 +4763,13 @@ if test "X$SED" != "X"; then
else
SED=$lt_cv_path_SED
fi
-{ $as_echo "$as_me:$LINENO: result: $SED" >&5
-$as_echo "$SED" >&6; }
+{ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
-{ $as_echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-$as_echo_n "checking how to recognise dependent libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
if test "${lt_cv_deplibs_check_method+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
@@ -4990,8 +4947,8 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
@@ -5002,10 +4959,10 @@ deplibs_check_method=$lt_cv_deplibs_check_method
# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output" >&5
-$as_echo_n "checking command to parse $NM output... " >&6; }
+{ echo "$as_me:$LINENO: checking command to parse $NM output" >&5
+echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6; }
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
# These are sane defaults that work on at least a few old systems.
@@ -5089,14 +5046,14 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Now try to grab the symbols.
nlist=conftest.nm
if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
@@ -5151,7 +5108,7 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest$ac_exeext; then
pipe_works=yes
fi
@@ -5192,11 +5149,11 @@ else
fi
if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
then
- { $as_echo "$as_me:$LINENO: result: failed" >&5
-$as_echo "failed" >&6; }
+ { echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: ok" >&5
-$as_echo "ok" >&6; }
+ { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
fi
ac_ext=c
@@ -5204,15 +5161,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
if test "${ac_cv_prog_CPP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -5244,21 +5201,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -5282,14 +5238,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -5297,7 +5252,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -5322,8 +5277,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -5351,21 +5306,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -5389,14 +5343,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -5404,7 +5357,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -5420,9 +5373,9 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5434,16 +5387,16 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
if test "${ac_cv_path_GREP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Extract the first word of "grep ggrep" to use in msg output
if test -z "$GREP"; then
set dummy grep ggrep; ac_prog_name=$2
if test "${ac_cv_path_GREP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_path_GREP_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
@@ -5463,13 +5416,13 @@ case `"$ac_path_GREP" --version 2>&1` in
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
*)
ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
+ echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -5497,8 +5450,8 @@ fi
GREP="$ac_cv_path_GREP"
if test -z "$GREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5508,15 +5461,15 @@ fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
if test "${ac_cv_path_EGREP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
@@ -5525,7 +5478,7 @@ else
if test -z "$EGREP"; then
set dummy egrep; ac_prog_name=$2
if test "${ac_cv_path_EGREP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_path_EGREP_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
@@ -5545,13 +5498,13 @@ case `"$ac_path_EGREP" --version 2>&1` in
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
+ echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -5579,8 +5532,8 @@ fi
EGREP="$ac_cv_path_EGREP"
if test -z "$EGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5591,15 +5544,15 @@ fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5626,21 +5579,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
@@ -5732,26 +5684,24 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -5763,8 +5713,8 @@ fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -5786,11 +5736,11 @@ fi
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5808,21 +5758,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
@@ -5830,14 +5779,12 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -5848,21 +5795,20 @@ done
for ac_header in dlfcn.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5878,33 +5824,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5918,72 +5863,69 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -5999,10 +5941,10 @@ done
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $MAGIC_CMD in
/*)
@@ -6054,19 +5996,19 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
- { $as_echo "$as_me:$LINENO: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
+ { echo "$as_me:$LINENO: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $MAGIC_CMD in
/*)
@@ -6118,11 +6060,11 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
else
@@ -6137,10 +6079,10 @@ esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_RANLIB+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -6153,7 +6095,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6164,11 +6106,11 @@ fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -6177,10 +6119,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -6193,7 +6135,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6204,11 +6146,11 @@ fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$ac_ct_RANLIB" = x; then
@@ -6216,10 +6158,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
@@ -6233,10 +6175,10 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -6249,7 +6191,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6260,11 +6202,11 @@ fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -6273,10 +6215,10 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -6289,7 +6231,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6300,11 +6242,11 @@ fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@ -6312,10 +6254,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
@@ -6342,11 +6284,11 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6345 "configure"' > conftest.$ac_ext
+ echo '#line 6287 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
@@ -6367,10 +6309,10 @@ case $host in
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
if test "${lt_cv_cc_needs_belf+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_ext=c
@@ -6400,14 +6342,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -6415,7 +6356,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
lt_cv_cc_needs_belf=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
lt_cv_cc_needs_belf=no
@@ -6430,8 +6371,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
@@ -6533,8 +6474,8 @@ compiler="$2"
## FIXME: this should be a separate macro
##
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
+{ echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
if test -d .libs; then
@@ -6544,8 +6485,8 @@ else
objdir=_libs
fi
rmdir .libs 2>/dev/null
-{ $as_echo "$as_me:$LINENO: result: $objdir" >&5
-$as_echo "$objdir" >&6; }
+{ echo "$as_me:$LINENO: result: $objdir" >&5
+echo "${ECHO_T}$objdir" >&6; }
##
## END FIXME
@@ -6565,10 +6506,10 @@ test -z "$pic_mode" && pic_mode=default
# We assume here that the value for lt_cv_prog_cc_pic will not be cached
# in isolation, and that seeing it set (from the cache) indicates that
# the associated values are set (in the cache) correctly too.
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
if test "${lt_cv_prog_cc_pic+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_prog_cc_pic=
lt_cv_prog_cc_shlib=
@@ -6708,17 +6649,17 @@ else
fi
if test -z "$lt_cv_prog_cc_pic"; then
- { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5
-$as_echo "$lt_cv_prog_cc_pic" >&6; }
+ { echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6; }
# Check to make sure the pic_flag actually works.
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... " >&6; }
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6; }
if test "${lt_cv_prog_cc_pic_works+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
@@ -6743,14 +6684,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -6772,7 +6712,7 @@ $as_echo "$ac_try_echo") >&5
esac
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
lt_cv_prog_cc_pic_works=no
@@ -6792,30 +6732,30 @@ fi
lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5
-$as_echo "$lt_cv_prog_cc_pic_works" >&6; }
+ { echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6; }
fi
##
## END FIXME
# Check for any special shared library compilation flags.
if test -n "$lt_cv_prog_cc_shlib"; then
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
-$as_echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
+ { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
+echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then :
else
- { $as_echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-$as_echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+ { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
lt_cv_prog_cc_can_build_shared=no
fi
fi
## FIXME: this should be a separate macro
##
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
-$as_echo_n "checking if $compiler static flag $lt_cv_prog_cc_static works... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6; }
if test "${lt_cv_prog_cc_static_works+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_prog_cc_static_works=no
save_LDFLAGS="$LDFLAGS"
@@ -6841,14 +6781,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -6856,7 +6795,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
lt_cv_prog_cc_static_works=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6871,8 +6810,8 @@ fi
# Belt *and* braces to stop my trousers falling down:
test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5
-$as_echo "$lt_cv_prog_cc_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6; }
pic_flag="$lt_cv_prog_cc_pic"
special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
@@ -6887,10 +6826,10 @@ can_build_shared="$lt_cv_prog_cc_can_build_shared"
## FIXME: this should be a separate macro
##
# Check to see if options -o and -c are simultaneously supported by compiler
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_compiler_c_o+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
$rm -r conftest 2>/dev/null
@@ -6907,7 +6846,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:6910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:6849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@@ -6931,15 +6870,15 @@ $rm -r conftest 2>/dev/null
fi
compiler_c_o=$lt_cv_compiler_c_o
-{ $as_echo "$as_me:$LINENO: result: $compiler_c_o" >&5
-$as_echo "$compiler_c_o" >&6; }
+{ echo "$as_me:$LINENO: result: $compiler_c_o" >&5
+echo "${ECHO_T}$compiler_c_o" >&6; }
if test x"$compiler_c_o" = x"yes"; then
# Check to see if we can write to a .lo
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5
-$as_echo_n "checking if $compiler supports -c -o file.lo... " >&6; }
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6; }
if test "${lt_cv_compiler_o_lo+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_compiler_o_lo=no
@@ -6968,14 +6907,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -6989,7 +6927,7 @@ $as_echo "$ac_try_echo") >&5
fi
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7002,8 +6940,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
compiler_o_lo=$lt_cv_compiler_o_lo
- { $as_echo "$as_me:$LINENO: result: $compiler_o_lo" >&5
-$as_echo "$compiler_o_lo" >&6; }
+ { echo "$as_me:$LINENO: result: $compiler_o_lo" >&5
+echo "${ECHO_T}$compiler_o_lo" >&6; }
else
compiler_o_lo=no
fi
@@ -7016,19 +6954,19 @@ fi
hard_links="nottested"
if test "$compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
if test "$hard_links" = no; then
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -7041,8 +6979,8 @@ fi
##
if test "$GCC" = yes; then
# Check to see if options -fno-rtti -fno-exceptions are supported by compiler
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+ { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
echo "int some_variable = 0;" > conftest.$ac_ext
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
@@ -7068,14 +7006,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -7089,7 +7026,7 @@ $as_echo "$ac_try_echo") >&5
fi
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7097,8 +7034,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
- { $as_echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5
-$as_echo "$compiler_rtti_exceptions" >&6; }
+ { echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$compiler_rtti_exceptions" >&6; }
if test "$compiler_rtti_exceptions" = "yes"; then
no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
@@ -7112,8 +7049,8 @@ fi
## FIXME: this should be a separate macro
##
# See if the linker supports building shared libraries.
-{ $as_echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the linker ($LD) supports shared libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6; }
allow_undefined_flag=
no_undefined_flag=
@@ -7807,8 +7744,8 @@ EOF
;;
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
##
## END FIXME
@@ -7816,8 +7753,8 @@ test "$ld_shlibs" = no && can_build_shared=no
## FIXME: this should be a separate macro
##
# Check hardcoding attributes.
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var"; then
@@ -7840,8 +7777,8 @@ else
# directories.
hardcode_action=unsupported
fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6; }
##
## END FIXME
@@ -7849,16 +7786,16 @@ $as_echo "$hardcode_action" >&6; }
##
striplib=
old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
##
## END FIXME
@@ -7869,8 +7806,8 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
## FIXME: this should be a separate macro
##
# PORTME Fill in your ld.so characteristics
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8289,8 +8226,8 @@ sysv4*MP*)
dynamic_linker=no
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
##
## END FIXME
@@ -8298,17 +8235,17 @@ test "$dynamic_linker" = no && can_build_shared=no
## FIXME: this should be a separate macro
##
# Report the final consequences.
-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
##
## END FIXME
## FIXME: this should be a separate macro
##
-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -8328,19 +8265,19 @@ aix4*)
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
##
## END FIXME
## FIXME: this should be a separate macro
##
-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
##
## END FIXME
@@ -8379,10 +8316,10 @@ else
;;
*)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
+ { echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
if test "${ac_cv_func_shl_load+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -8435,14 +8372,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -8450,7 +8386,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
ac_cv_func_shl_load=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_shl_load=no
@@ -8459,15 +8395,15 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
if test $ac_cv_func_shl_load = yes; then
lt_cv_dlopen="shl_load"
else
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
@@ -8499,14 +8435,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -8514,7 +8449,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
ac_cv_lib_dld_shl_load=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_shl_load=no
@@ -8524,15 +8459,15 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
+ { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
if test "${ac_cv_func_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -8585,14 +8520,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -8600,7 +8534,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
ac_cv_func_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_dlopen=no
@@ -8609,15 +8543,15 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
if test $ac_cv_func_dlopen = yes; then
lt_cv_dlopen="dlopen"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
@@ -8649,14 +8583,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -8664,7 +8597,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
@@ -8674,15 +8607,15 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
@@ -8714,14 +8647,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -8729,7 +8661,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
ac_cv_lib_svld_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_svld_dlopen=no
@@ -8739,15 +8671,15 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
if test $ac_cv_lib_svld_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
@@ -8779,14 +8711,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -8794,7 +8725,7 @@ $as_echo "$ac_try_echo") >&5
$as_test_x conftest$ac_exeext; then
ac_cv_lib_dld_dld_link=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_dld_link=no
@@ -8804,8 +8735,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
@@ -8845,10 +8776,10 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self=cross
@@ -8856,7 +8787,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8859 "configure"
+#line 8790 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8920,7 +8851,7 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
@@ -8938,15 +8869,15 @@ rm -fr conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
if test "x$lt_cv_dlopen_self" = xyes; then
LDFLAGS="$LDFLAGS $link_static_flag"
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self_static+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self_static=cross
@@ -8954,7 +8885,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8957 "configure"
+#line 8888 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9018,7 +8949,7 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
@@ -9036,8 +8967,8 @@ rm -fr conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
fi
CPPFLAGS="$save_CPPFLAGS"
@@ -9069,10 +9000,10 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
$rm conftest*
echo 'static int dummy;' > conftest.$ac_ext
@@ -9080,7 +9011,7 @@ else
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
soname=conftest
lib=conftest
@@ -9097,7 +9028,7 @@ else
if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
then
lt_cv_archive_cmds_need_lc=no
@@ -9110,8 +9041,8 @@ else
fi
fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+ { echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
+echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6; }
;;
esac
fi
@@ -9795,6 +9726,12 @@ if test -d $srcdir/lacheck; then
subdirs="$subdirs lacheck"
fi
fi
+if test -d $srcdir/lcdf-typetools; then
+ if test "x$with_lcdf_typetools" != xno; then
+ ESUBDIRS="$ESUBDIRS lcdf-typetools"
+ subdirs="$subdirs lcdf-typetools"
+ fi
+fi
if test -d $srcdir/makeindexk; then
if test "x$with_makeindexk" != xno; then
ESUBDIRS="$ESUBDIRS makeindexk"
@@ -9900,12 +9837,11 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -9938,12 +9874,12 @@ $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -9989,7 +9925,7 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ ac_i=`echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -10004,8 +9940,8 @@ LTLIBOBJS=$ac_ltlibobjs
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
# Generated by $as_me.
@@ -10051,38 +9987,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
echo "#! /bin/sh" >conf$$.sh
@@ -10109,6 +10013,8 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
+as_nl='
+'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -10131,7 +10037,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -10176,7 +10082,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -10227,7 +10133,7 @@ $as_unset CDPATH
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -10255,6 +10161,7 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -10330,7 +10237,7 @@ exec 6>&1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61a. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -10373,8 +10280,8 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.61a,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
@@ -10383,7 +10290,6 @@ gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
-test -n "\$AWK" || AWK=awk
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -10410,7 +10316,7 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
+ echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
@@ -10418,13 +10324,13 @@ do
CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
+ echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { $as_echo "$as_me: error: unrecognized option: $1
+ -*) { echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
@@ -10445,12 +10351,10 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- set X '$SHELL' '$0'$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
export CONFIG_SHELL
- exec "\$@"
+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
fi
_ACEOF
@@ -10461,7 +10365,7 @@ exec 5>>config.log
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- $as_echo "$ac_log"
+ echo "$ac_log"
} >&5
_ACEOF
@@ -10477,8 +10381,8 @@ do
"Makefile.aux") CONFIG_FILES="$CONFIG_FILES Makefile.aux:Makefile.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.aux" ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
done
@@ -10517,119 +10421,141 @@ $debug ||
(umask 077 && mkdir "$tmp")
} ||
{
- $as_echo "$me: cannot create a temporary directory in ." >&2
+ echo "$me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "$CONFIG_FILES"; then
-echo 'BEGIN {' >"$tmp/subs.awk"
_ACEOF
-{
- echo "cat >conf$$subs.awk <<_ACEOF"
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/'
- echo "_ACEOF"
-} >conf$$subs.sh
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh
+ cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+LN_S!$LN_S$ac_delim
+ac_prefix_program!$ac_prefix_program$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+MAINT!$MAINT$ac_delim
+LD!$LD$ac_delim
+AR!$AR$ac_delim
+ARFLAGS!$ARFLAGS$ac_delim
+texmfmain!$texmfmain$ac_delim
+socketlibs!$socketlibs$ac_delim
+LDT1LIB!$LDT1LIB$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+ECHO!$ECHO$ac_delim
+RANLIB!$RANLIB$ac_delim
+STRIP!$STRIP$ac_delim
+CPP!$CPP$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+subdirs!$subdirs$ac_delim
+ESUBDIRS!$ESUBDIRS$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
-rm -f conf$$subs.sh
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
cat >>$CONFIG_STATUS <<_ACEOF
-cat >>"\$tmp/subs.awk" <<\CEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^"]/{
- N
- s/\n//
-}
-' >>$CONFIG_STATUS
-rm -f conf$$subs.awk
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
-CEOF
-cat >>"\$tmp/subs.awk" <<CEOF
- for (key in S) S_is_set[key] = 1
- FS = ""
-
-}
-{
- line = $ 0
- nfields = split(line, field, "@")
- substed = 0
- len = length(field[1])
- for (i = 2; i < nfields; i++) {
- key = field[i]
- keylen = length(key)
- if (S_is_set[key]) {
- value = S[key]
- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
- len += length(value) + length(field[++i])
- substed = 1
- } else
- len += 1 + keylen
- }
-
- print line
-}
-
-CEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
_ACEOF
+
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@@ -10656,8 +10582,8 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -10686,8 +10612,8 @@ $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
{ (exit 1); exit 1; }; };;
esac
ac_file_inputs="$ac_file_inputs $ac_f"
@@ -10696,13 +10622,12 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input='Generated from '`
- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
- `' by configure.'
+ configure_input="Generated from "`IFS=:
+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
fi
case $ac_tag in
@@ -10716,7 +10641,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -10742,7 +10667,7 @@ $as_echo X"$ac_file" |
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -10751,7 +10676,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -10772,17 +10697,17 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10839,8 +10764,8 @@ case `sed -n '/datarootdir/ {
' $ac_file_inputs` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_datarootdir_hack='
@@ -10874,14 +10799,14 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | $AWK -f "$tmp/subs.awk" >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
@@ -10900,8 +10825,8 @@ which seems to be undefined. Please make sure it is defined." >&2;}
"Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
kpse_input=`case Makefile.in in
[\\/$]*) # Absolute
- test -f "Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: Makefile.in" >&5
-$as_echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
+ test -f "Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: Makefile.in" >&5
+echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
{ (exit 1); exit 1; }; }
echo "Makefile.in";;
*) # Relative
@@ -10913,8 +10838,8 @@ $as_echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
echo "$srcdir/Makefile.in"
else
# /dev/null tree
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: Makefile.in" >&5
-$as_echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find input file: Makefile.in" >&5
+echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
{ (exit 1); exit 1; }; }
fi;;
esac` || { (exit 1); exit 1; }
@@ -10931,9 +10856,9 @@ $as_echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
# Be careful with whitespace; we need to use echo.
kpse_file_substs=`sed -n '/^kpse_include/s%[ ]*\(.*\)%\1%p' "$kpse_input"`
if test x"$kpse_file_substs" = x; then
- { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`Makefile.in'
+ { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`Makefile.in'
without any \`kpse_include' directives" >&5
-$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`Makefile.in'
+echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`Makefile.in'
without any \`kpse_include' directives" >&2;}
fi
# Create the sed command line ...
@@ -11035,7 +10960,7 @@ if test "$no_recursion" != yes; then
;;
*)
case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
esac
@@ -11045,7 +10970,7 @@ if test "$no_recursion" != yes; then
# in subdir configurations.
ac_arg="--prefix=$prefix"
case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
@@ -11062,8 +10987,8 @@ if test "$no_recursion" != yes; then
test -d "$srcdir/$ac_dir" || continue
ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
- $as_echo "$as_me:$LINENO: $ac_msg" >&5
- $as_echo "$ac_msg" >&6
+ echo "$as_me:$LINENO: $ac_msg" >&5
+ echo "$ac_msg" >&6
{ as_dir="$ac_dir"
case $as_dir in #(
-*) as_dir=./$as_dir;;
@@ -11072,7 +10997,7 @@ if test "$no_recursion" != yes; then
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -11081,7 +11006,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -11102,17 +11027,17 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -11151,8 +11076,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
# This should be Cygnus configure.
ac_sub_configure=$ac_aux_dir/configure
else
- { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+ { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
ac_sub_configure=
fi
@@ -11165,13 +11090,13 @@ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
- { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+ { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
# The eval makes quoting arguments work.
eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
--cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
- { { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+ { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
{ (exit 1); exit 1; }; }
fi
diff --git a/Build/source/texk/configure.in b/Build/source/texk/configure.in
index ad060defe49..16039cb4dac 100644
--- a/Build/source/texk/configure.in
+++ b/Build/source/texk/configure.in
@@ -66,6 +66,7 @@ KPSE_CONFIG_SUBDIRS([
dvipsk
gsftopk
lacheck
+ lcdf-typetools
makeindexk
musixflx
ps2pkm
diff --git a/Build/source/utils/lcdf-typetools/7t.enc b/Build/source/texk/lcdf-typetools/7t.enc
index 727f29e5f8c..727f29e5f8c 100644
--- a/Build/source/utils/lcdf-typetools/7t.enc
+++ b/Build/source/texk/lcdf-typetools/7t.enc
diff --git a/Build/source/utils/lcdf-typetools/COPYING b/Build/source/texk/lcdf-typetools/COPYING
index 67572846722..67572846722 100644
--- a/Build/source/utils/lcdf-typetools/COPYING
+++ b/Build/source/texk/lcdf-typetools/COPYING
diff --git a/Build/source/utils/lcdf-typetools/INSTALL b/Build/source/texk/lcdf-typetools/INSTALL
index 95d84c820fb..95d84c820fb 100644
--- a/Build/source/utils/lcdf-typetools/INSTALL
+++ b/Build/source/texk/lcdf-typetools/INSTALL
diff --git a/Build/source/utils/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index 6fd1265708e..d03fd0071ca 100644
--- a/Build/source/utils/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -54,6 +54,7 @@ EXTRA_DIST = \
include/efont/t1rw.hh \
include/efont/t1unparser.hh \
include/efont/ttfcs.hh \
+ include/efont/ttfhead.hh \
glyphlist.txt \
texglyphlist.txt \
7t.enc
diff --git a/Build/source/utils/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index 6c2a51c777e..3cb144ea26f 100644
--- a/Build/source/utils/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -219,6 +219,7 @@ EXTRA_DIST = \
include/efont/t1rw.hh \
include/efont/t1unparser.hh \
include/efont/ttfcs.hh \
+ include/efont/ttfhead.hh \
glyphlist.txt \
texglyphlist.txt \
7t.enc
diff --git a/Build/source/utils/lcdf-typetools/NEWS b/Build/source/texk/lcdf-typetools/NEWS
index 27223e76d29..a883624ebdc 100644
--- a/Build/source/utils/lcdf-typetools/NEWS
+++ b/Build/source/texk/lcdf-typetools/NEWS
@@ -1,5 +1,120 @@
LCDF Typetools NEWS
+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.
diff --git a/Build/source/utils/lcdf-typetools/ONEWS b/Build/source/texk/lcdf-typetools/ONEWS
index 6bd9dc8c42d..6bd9dc8c42d 100644
--- a/Build/source/utils/lcdf-typetools/ONEWS
+++ b/Build/source/texk/lcdf-typetools/ONEWS
diff --git a/Build/source/utils/lcdf-typetools/README b/Build/source/texk/lcdf-typetools/README
index 9b021dcf1a3..01dbe534d9e 100644
--- a/Build/source/utils/lcdf-typetools/README
+++ b/Build/source/texk/lcdf-typetools/README
@@ -1,4 +1,4 @@
-LCDF-TYPETOOLS 2.48
+LCDF-TYPETOOLS 2.66
===================
USAGE
diff --git a/Build/source/utils/lcdf-typetools/aclocal.m4 b/Build/source/texk/lcdf-typetools/aclocal.m4
index b7a0e851eea..b7a0e851eea 100644
--- a/Build/source/utils/lcdf-typetools/aclocal.m4
+++ b/Build/source/texk/lcdf-typetools/aclocal.m4
diff --git a/Build/source/utils/lcdf-typetools/cfftot1/Makefile.am b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.am
index 6bfd3a37b6c..6bfd3a37b6c 100644
--- a/Build/source/utils/lcdf-typetools/cfftot1/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
index 11e6827e9d7..11e6827e9d7 100644
--- a/Build/source/utils/lcdf-typetools/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1
index 0917c946fb3..f2c2036dfcb 100644
--- a/Build/source/utils/lcdf-typetools/cfftot1/cfftot1.1
+++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1
@@ -1,4 +1,4 @@
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/utils/lcdf-typetools/cfftot1/cfftot1.cc b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc
index 4f43d15742c..4f43d15742c 100644
--- a/Build/source/utils/lcdf-typetools/cfftot1/cfftot1.cc
+++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc
diff --git a/Build/source/utils/lcdf-typetools/cfftot1/maket1font.cc b/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc
index f693ce8b0ba..f693ce8b0ba 100644
--- a/Build/source/utils/lcdf-typetools/cfftot1/maket1font.cc
+++ b/Build/source/texk/lcdf-typetools/cfftot1/maket1font.cc
diff --git a/Build/source/utils/lcdf-typetools/cfftot1/maket1font.hh b/Build/source/texk/lcdf-typetools/cfftot1/maket1font.hh
index 75f2527897f..75f2527897f 100644
--- a/Build/source/utils/lcdf-typetools/cfftot1/maket1font.hh
+++ b/Build/source/texk/lcdf-typetools/cfftot1/maket1font.hh
diff --git a/Build/source/utils/lcdf-typetools/config.h.in b/Build/source/texk/lcdf-typetools/config.h.in
index 6ed2f7049ab..6ed2f7049ab 100644
--- a/Build/source/utils/lcdf-typetools/config.h.in
+++ b/Build/source/texk/lcdf-typetools/config.h.in
diff --git a/Build/source/utils/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index 439ab5823ac..7192f80b5d4 100755
--- a/Build/source/utils/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -1639,7 +1639,7 @@ fi
# Define the identity of the package.
PACKAGE=lcdf-typetools
- VERSION=2.48
+ VERSION=2.66
cat >>confdefs.h <<_ACEOF
diff --git a/Build/source/utils/lcdf-typetools/configure.in b/Build/source/texk/lcdf-typetools/configure.in
index b1edd0550e4..8161453d62d 100644
--- a/Build/source/utils/lcdf-typetools/configure.in
+++ b/Build/source/texk/lcdf-typetools/configure.in
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(NEWS)
-AM_INIT_AUTOMAKE(lcdf-typetools, 2.48)
+AM_INIT_AUTOMAKE(lcdf-typetools, 2.66)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff --git a/Build/source/utils/lcdf-typetools/depcomp b/Build/source/texk/lcdf-typetools/depcomp
index 04701da536f..04701da536f 100644..100755
--- a/Build/source/utils/lcdf-typetools/depcomp
+++ b/Build/source/texk/lcdf-typetools/depcomp
diff --git a/Build/source/utils/lcdf-typetools/glyphlist.txt b/Build/source/texk/lcdf-typetools/glyphlist.txt
index a1a22702a8e..a1a22702a8e 100644
--- a/Build/source/utils/lcdf-typetools/glyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/glyphlist.txt
diff --git a/Build/source/utils/lcdf-typetools/include/efont/afm.hh b/Build/source/texk/lcdf-typetools/include/efont/afm.hh
index 465ff87dd54..465ff87dd54 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/afm.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/afm.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/afmparse.hh b/Build/source/texk/lcdf-typetools/include/efont/afmparse.hh
index 5a5350a55c7..5a5350a55c7 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/afmparse.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/afmparse.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/afmw.hh b/Build/source/texk/lcdf-typetools/include/efont/afmw.hh
index fa883517999..fa883517999 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/afmw.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/afmw.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/amfm.hh b/Build/source/texk/lcdf-typetools/include/efont/amfm.hh
index 27e87c093ca..27e87c093ca 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/amfm.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/amfm.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/cff.hh b/Build/source/texk/lcdf-typetools/include/efont/cff.hh
index 775f56498f6..775f56498f6 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/cff.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/cff.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/encoding.hh b/Build/source/texk/lcdf-typetools/include/efont/encoding.hh
index 59758b06607..59758b06607 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/encoding.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/encoding.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/findmet.hh b/Build/source/texk/lcdf-typetools/include/efont/findmet.hh
index dcfa8fb438a..dcfa8fb438a 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/findmet.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/findmet.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/metrics.hh b/Build/source/texk/lcdf-typetools/include/efont/metrics.hh
index ae0a61126ed..ae0a61126ed 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/metrics.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/otf.hh b/Build/source/texk/lcdf-typetools/include/efont/otf.hh
index 0333e70e3f5..0333e70e3f5 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/otf.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/otf.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/otfcmap.hh b/Build/source/texk/lcdf-typetools/include/efont/otfcmap.hh
index 7f732364bff..7f732364bff 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/otfcmap.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/otfcmap.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/otfdata.hh b/Build/source/texk/lcdf-typetools/include/efont/otfdata.hh
index b8df8b6dcbf..b8df8b6dcbf 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/otfdata.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/otfdata.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/otfgpos.hh b/Build/source/texk/lcdf-typetools/include/efont/otfgpos.hh
index 6843370ac5b..bc274285485 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/otfgpos.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/otfgpos.hh
@@ -30,17 +30,19 @@ class Gpos { public:
class GposLookup { public:
GposLookup(const Data &) throw (Error);
- int type() const { return _d.u16(0); }
+ int type() const { return _type; }
uint16_t flags() const { return _d.u16(2); }
bool unparse_automatics(Vector<Positioning> &, ErrorHandler * = 0) const;
enum {
HEADERSIZE = 6, RECSIZE = 2,
L_SINGLE = 1, L_PAIR = 2, L_CURSIVE = 3, L_MARKTOBASE = 4,
L_MARKTOLIGATURE = 5, L_MARKTOMARK = 6, L_CONTEXT = 7,
- L_CHAIN = 8
+ L_CHAIN = 8, L_EXTENSION = 9
};
private:
Data _d;
+ int _type;
+ Data subtable(int i) const;
};
class GposValue { public:
diff --git a/Build/source/utils/lcdf-typetools/include/efont/otfgsub.hh b/Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh
index fb2782c4578..a930b12f7ab 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/otfgsub.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh
@@ -32,17 +32,19 @@ class Gsub { public:
class GsubLookup { public:
GsubLookup(const Data &) throw (Error);
- int type() const { return _d.u16(0); }
+ int type() const { return _type; }
uint16_t flags() const { return _d.u16(2); }
bool unparse_automatics(const Gsub &, Vector<Substitution> &) const;
bool apply(const Glyph *, int pos, int n, Substitution &) const;
enum {
HEADERSIZE = 6, RECSIZE = 2,
L_SINGLE = 1, L_MULTIPLE = 2, L_ALTERNATE = 3, L_LIGATURE = 4,
- L_CONTEXT = 5, L_CHAIN = 6, L_REVCHAIN = 8
+ L_CONTEXT = 5, L_CHAIN = 6, L_EXTENSION = 7, L_REVCHAIN = 8
};
private:
Data _d;
+ int _type;
+ Data subtable(int i) const;
};
class GsubSingle { public:
diff --git a/Build/source/utils/lcdf-typetools/include/efont/otfname.hh b/Build/source/texk/lcdf-typetools/include/efont/otfname.hh
index 7643b66923d..7643b66923d 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/otfname.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/otfname.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/otfos2.hh b/Build/source/texk/lcdf-typetools/include/efont/otfos2.hh
index 23cc513715a..23cc513715a 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/otfos2.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/otfos2.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/otfpost.hh b/Build/source/texk/lcdf-typetools/include/efont/otfpost.hh
index 4d7ff64146c..4d7ff64146c 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/otfpost.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/otfpost.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/pairop.hh b/Build/source/texk/lcdf-typetools/include/efont/pairop.hh
index c445f16624a..c445f16624a 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/pairop.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/pairop.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/psres.hh b/Build/source/texk/lcdf-typetools/include/efont/psres.hh
index b08e2fe35a5..b08e2fe35a5 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/psres.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/psres.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/t1bounds.hh b/Build/source/texk/lcdf-typetools/include/efont/t1bounds.hh
index 116705f9a10..116705f9a10 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/t1bounds.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/t1bounds.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/t1cs.hh b/Build/source/texk/lcdf-typetools/include/efont/t1cs.hh
index 41e27b77d72..35816f6f64e 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/t1cs.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/t1cs.hh
@@ -197,8 +197,9 @@ class CharstringProgram { public:
CharstringProgram() : _parent_program(false) { }
virtual ~CharstringProgram() { }
- virtual PermString font_name() const { return PermString();}
+ virtual PermString font_name() const { return PermString(); }
virtual void font_matrix(double[6]) const;
+ virtual int units_per_em() const;
inline const CharstringProgram *program(int) const;
virtual const CharstringProgram *child_program(int) const;
diff --git a/Build/source/utils/lcdf-typetools/include/efont/t1csgen.hh b/Build/source/texk/lcdf-typetools/include/efont/t1csgen.hh
index c03684fba42..8c054643f86 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/t1csgen.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/t1csgen.hh
@@ -23,7 +23,7 @@ class Type1CharstringGen { public:
void append_charstring(const String &);
const Point &current_point(bool real) const { return (real ? _true : _false); }
- void gen_moveto(const Point &, bool closepath);
+ void gen_moveto(const Point &, bool closepath, bool always);
inline String take_string();
Type1Charstring *output();
diff --git a/Build/source/utils/lcdf-typetools/include/efont/t1font.hh b/Build/source/texk/lcdf-typetools/include/efont/t1font.hh
index 887e141c8e5..e63e2197d42 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/t1font.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/t1font.hh
@@ -89,7 +89,7 @@ class Type1Font : public CharstringProgram { public:
// font skeletons
static Type1Font *skeleton_make(PermString, const String &version = String());
- static Type1Font *skeleton_make_copy(const Type1Font *, PermString);
+ static Type1Font *skeleton_make_copy(const Type1Font *, PermString, const Vector<double> *xuid_extension);
void skeleton_comments_end();
void skeleton_fontinfo_end();
void skeleton_fontdict_end();
diff --git a/Build/source/utils/lcdf-typetools/include/efont/t1interp.hh b/Build/source/texk/lcdf-typetools/include/efont/t1interp.hh
index 934c0a5885f..934c0a5885f 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/t1interp.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/t1interp.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/t1item.hh b/Build/source/texk/lcdf-typetools/include/efont/t1item.hh
index 7358410e38e..7358410e38e 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/t1item.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/t1item.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/t1mm.hh b/Build/source/texk/lcdf-typetools/include/efont/t1mm.hh
index 94e32e3ed14..94e32e3ed14 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/t1mm.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/t1mm.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/t1rw.hh b/Build/source/texk/lcdf-typetools/include/efont/t1rw.hh
index ae37856342a..ae37856342a 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/t1rw.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/t1rw.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/t1unparser.hh b/Build/source/texk/lcdf-typetools/include/efont/t1unparser.hh
index 06d46ee96ee..06d46ee96ee 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/t1unparser.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/t1unparser.hh
diff --git a/Build/source/utils/lcdf-typetools/include/efont/ttfcs.hh b/Build/source/texk/lcdf-typetools/include/efont/ttfcs.hh
index 81dbd5682f2..6253fac0c3d 100644
--- a/Build/source/utils/lcdf-typetools/include/efont/ttfcs.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/ttfcs.hh
@@ -11,6 +11,8 @@ class TrueTypeBoundsCharstringProgram : public CharstringProgram { public:
TrueTypeBoundsCharstringProgram(const OpenType::Font *);
~TrueTypeBoundsCharstringProgram();
+ int units_per_em() const;
+
int nglyphs() const;
Charstring *glyph(int gi) const;
PermString glyph_name(int gi) const;
@@ -22,7 +24,7 @@ class TrueTypeBoundsCharstringProgram : public CharstringProgram { public:
int _nglyphs;
int _nhmtx;
bool _loca_long;
- double _em_xform;
+ int _units_per_em;
OpenType::Data _loca;
OpenType::Data _glyf;
OpenType::Data _hmtx;
diff --git a/Build/source/texk/lcdf-typetools/include/efont/ttfhead.hh b/Build/source/texk/lcdf-typetools/include/efont/ttfhead.hh
new file mode 100644
index 00000000000..59ad0d95aec
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/include/efont/ttfhead.hh
@@ -0,0 +1,41 @@
+// -*- related-file-name: "../../libefont/ttfhead.cc" -*-
+#ifndef EFONT_TTFHEAD_HH
+#define EFONT_TTFHEAD_HH
+#include <efont/otf.hh>
+#include <efont/otfdata.hh> // for ntohl()
+#include <lcdf/error.hh>
+namespace Efont { namespace OpenType {
+
+class Head { public:
+
+ Head(const String &, ErrorHandler * = 0);
+ // default destructor
+
+ bool ok() const { return _error >= 0; }
+ int error() const { return _error; }
+
+ unsigned units_per_em() const;
+ unsigned index_to_loc_format() const;
+
+ private:
+
+ Data _d;
+ int _error;
+
+ int parse_header(ErrorHandler *);
+
+};
+
+
+inline unsigned Head::units_per_em() const
+{
+ return (_error >= 0 ? _d.u16(18) : 0);
+}
+
+inline unsigned Head::index_to_loc_format() const
+{
+ return (_error >= 0 ? _d.u16(50) : 0);
+}
+
+}}
+#endif
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/bezier.hh b/Build/source/texk/lcdf-typetools/include/lcdf/bezier.hh
index 2635069521b..2635069521b 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/bezier.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/bezier.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/clp.h b/Build/source/texk/lcdf-typetools/include/lcdf/clp.h
index 2126aacbf9c..2126aacbf9c 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/clp.h
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/clp.h
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/error.hh b/Build/source/texk/lcdf-typetools/include/lcdf/error.hh
index 8d38cbfb87a..8d38cbfb87a 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/error.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/error.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/filename.hh b/Build/source/texk/lcdf-typetools/include/lcdf/filename.hh
index 9f1589d4779..9f1589d4779 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/filename.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/filename.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/globmatch.hh b/Build/source/texk/lcdf-typetools/include/lcdf/globmatch.hh
index 963035e0ead..963035e0ead 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/globmatch.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/globmatch.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/hashmap.cc b/Build/source/texk/lcdf-typetools/include/lcdf/hashmap.cc
index 17cec16e0d5..17cec16e0d5 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/hashmap.cc
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/hashmap.cc
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/hashmap.hh b/Build/source/texk/lcdf-typetools/include/lcdf/hashmap.hh
index 10b5c321177..10b5c321177 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/hashmap.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/hashmap.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/inttypes.h b/Build/source/texk/lcdf-typetools/include/lcdf/inttypes.h
index b88e9e9faf0..b88e9e9faf0 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/inttypes.h
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/inttypes.h
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/landmark.hh b/Build/source/texk/lcdf-typetools/include/lcdf/landmark.hh
index 836f14ec088..836f14ec088 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/landmark.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/landmark.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/md5.h b/Build/source/texk/lcdf-typetools/include/lcdf/md5.h
index 7d7f8641d23..7d7f8641d23 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/md5.h
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/md5.h
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/permstr.hh b/Build/source/texk/lcdf-typetools/include/lcdf/permstr.hh
index 2db15772ded..2db15772ded 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/permstr.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/permstr.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/point.hh b/Build/source/texk/lcdf-typetools/include/lcdf/point.hh
index a4d2495cac2..a4d2495cac2 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/point.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/point.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/slurper.hh b/Build/source/texk/lcdf-typetools/include/lcdf/slurper.hh
index 2e400d3c3f2..2e400d3c3f2 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/slurper.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/slurper.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/straccum.hh b/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh
index e6c6422d2af..e6c6422d2af 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/straccum.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/string.hh b/Build/source/texk/lcdf-typetools/include/lcdf/string.hh
index 34eb1af3ed9..34eb1af3ed9 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/string.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/string.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/strtonum.h b/Build/source/texk/lcdf-typetools/include/lcdf/strtonum.h
index ee8745a4a42..ee8745a4a42 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/strtonum.h
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/strtonum.h
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/transform.hh b/Build/source/texk/lcdf-typetools/include/lcdf/transform.hh
index 64c8dc384b7..64c8dc384b7 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/transform.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/transform.hh
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/vector.cc b/Build/source/texk/lcdf-typetools/include/lcdf/vector.cc
index 0097edb2e47..0097edb2e47 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/vector.cc
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/vector.cc
diff --git a/Build/source/utils/lcdf-typetools/include/lcdf/vector.hh b/Build/source/texk/lcdf-typetools/include/lcdf/vector.hh
index 672abb88036..672abb88036 100644
--- a/Build/source/utils/lcdf-typetools/include/lcdf/vector.hh
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/vector.hh
diff --git a/Build/source/utils/lcdf-typetools/install-sh b/Build/source/texk/lcdf-typetools/install-sh
index 4d4a9519eaf..4d4a9519eaf 100755
--- a/Build/source/utils/lcdf-typetools/install-sh
+++ b/Build/source/texk/lcdf-typetools/install-sh
diff --git a/Build/source/utils/lcdf-typetools/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec
index b3f2c2ae824..b3f2c2ae824 100644
--- a/Build/source/utils/lcdf-typetools/lcdf-typetools.spec
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec
diff --git a/Build/source/utils/lcdf-typetools/libefont/Makefile.am b/Build/source/texk/lcdf-typetools/libefont/Makefile.am
index a230ef7d44d..b28d0e4ad4f 100644
--- a/Build/source/utils/lcdf-typetools/libefont/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/libefont/Makefile.am
@@ -33,7 +33,8 @@ libefont_a_SOURCES = \
t1mm.cc \
t1rw.cc \
t1unparser.cc \
- ttfcs.cc
+ ttfcs.cc \
+ ttfhead.cc
libefont_a_LIBADD = @TEMPLATE_OBJS@
CLEANFILES = @TEMPLATE_OBJS@
diff --git a/Build/source/utils/lcdf-typetools/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/libefont/Makefile.in
index 5f71a78f767..ade4c16d4ab 100644
--- a/Build/source/utils/lcdf-typetools/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/libefont/Makefile.in
@@ -57,7 +57,8 @@ am_libefont_a_OBJECTS = afm.$(OBJEXT) afmparse.$(OBJEXT) \
psres.$(OBJEXT) t1bounds.$(OBJEXT) t1cs.$(OBJEXT) \
t1csgen.$(OBJEXT) t1interp.$(OBJEXT) t1item.$(OBJEXT) \
t1font.$(OBJEXT) t1fontskel.$(OBJEXT) t1mm.$(OBJEXT) \
- t1rw.$(OBJEXT) t1unparser.$(OBJEXT) ttfcs.$(OBJEXT)
+ t1rw.$(OBJEXT) t1unparser.$(OBJEXT) ttfcs.$(OBJEXT) \
+ ttfhead.$(OBJEXT)
libefont_a_OBJECTS = $(am_libefont_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -193,7 +194,8 @@ libefont_a_SOURCES = \
t1mm.cc \
t1rw.cc \
t1unparser.cc \
- ttfcs.cc
+ ttfcs.cc \
+ ttfhead.cc
libefont_a_LIBADD = @TEMPLATE_OBJS@
CLEANFILES = @TEMPLATE_OBJS@
@@ -275,6 +277,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1rw.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1unparser.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttfcs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttfhead.Po@am__quote@
.cc.o:
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/Build/source/utils/lcdf-typetools/libefont/afm.cc b/Build/source/texk/lcdf-typetools/libefont/afm.cc
index 1f61044ebc0..42110ba8d5b 100644
--- a/Build/source/utils/lcdf-typetools/libefont/afm.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/afm.cc
@@ -171,11 +171,11 @@ AfmReader::read()
break;
if (l.isall("CapHeight %g", &fd( fdCapHeight )))
break;
- if (l.isall("CharacterSet"))
+ if (l.isall("CharacterSet %+s", (PermString *) 0))
break;
if (l.isall("CharWidth %g %g", (double *)0, (double *)0))
break;
- if (l.isall("Comment"))
+ if (l.isall("Comment %+s", (PermString *) 0))
break;
goto invalid;
diff --git a/Build/source/utils/lcdf-typetools/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc
index e7e103eef12..319c4176e9e 100644
--- a/Build/source/utils/lcdf-typetools/libefont/afmparse.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc
@@ -278,7 +278,7 @@ AfmParser::vis(const char *formatsigned, va_list valist)
}
default:
- assert(0 && "internal error: bad %");
+ assert(0 /* internal error: bad % */);
FAIL("");
}
diff --git a/Build/source/utils/lcdf-typetools/libefont/afmw.cc b/Build/source/texk/lcdf-typetools/libefont/afmw.cc
index 6044b001551..6044b001551 100644
--- a/Build/source/utils/lcdf-typetools/libefont/afmw.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/afmw.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/amfm.cc b/Build/source/texk/lcdf-typetools/libefont/amfm.cc
index 6d2346b35d3..6d2346b35d3 100644
--- a/Build/source/utils/lcdf-typetools/libefont/amfm.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/amfm.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/cff.cc b/Build/source/texk/lcdf-typetools/libefont/cff.cc
index d54bb091606..c17ad9d6a97 100644
--- a/Build/source/utils/lcdf-typetools/libefont/cff.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/cff.cc
@@ -2,7 +2,7 @@
/* cff.{cc,hh} -- Compact Font Format fonts
*
- * Copyright (c) 1998-2006 Eddie Kohler
+ * Copyright (c) 1998-2007 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
@@ -330,9 +330,12 @@ static const Cff::Dict &
default_dict()
{
static Cff *cff;
- if (!cff)
+ static Cff::Font *cfffont;
+ if (!cfffont) {
cff = new Cff(String::stable_string((const char *) default_dict_cff_data, sizeof(default_dict_cff_data)), ErrorHandler::default_handler());
- return ((Cff::Font *) cff->font())->top_dict();
+ cfffont = (Cff::Font *) cff->font();
+ }
+ return cfffont->top_dict();
}
diff --git a/Build/source/utils/lcdf-typetools/libefont/encoding.cc b/Build/source/texk/lcdf-typetools/libefont/encoding.cc
index ee71957874f..ee71957874f 100644
--- a/Build/source/utils/lcdf-typetools/libefont/encoding.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/encoding.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/findmet.cc b/Build/source/texk/lcdf-typetools/libefont/findmet.cc
index d0b6ce3a5c9..d0b6ce3a5c9 100644
--- a/Build/source/utils/lcdf-typetools/libefont/findmet.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/findmet.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/metrics.cc b/Build/source/texk/lcdf-typetools/libefont/metrics.cc
index e0b834ff9e2..e0b834ff9e2 100644
--- a/Build/source/utils/lcdf-typetools/libefont/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/metrics.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/otf.cc b/Build/source/texk/lcdf-typetools/libefont/otf.cc
index 6b23caf7c64..80702ee2901 100644
--- a/Build/source/utils/lcdf-typetools/libefont/otf.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otf.cc
@@ -573,6 +573,7 @@ FeatureList::size_params(int fid, const Name &name, ErrorHandler *errh) const
for (int i = 0; i < 2; i++) {
String s = params(fid, 10, errh, i != 0);
const uint8_t *data = s.udata();
+ // errh->message("trying %d %d %d %d %d\n", USHORT_AT(data), USHORT_AT(data + 2), USHORT_AT(data + 4), USHORT_AT(data + 6), USHORT_AT(data + 8));
if (USHORT_AT(data) == 0) // design size == 0
continue;
if (USHORT_AT(data + 2) == 0 // subfamily ID == 0
@@ -580,13 +581,23 @@ FeatureList::size_params(int fid, const Name &name, ErrorHandler *errh) const
&& USHORT_AT(data + 8) == 0 // range end == 0
&& USHORT_AT(data + 4) == 0) // menu name ID == 0
return s;
- if (USHORT_AT(data) >= USHORT_AT(data + 6) // design size >= range start
- && USHORT_AT(data) <= USHORT_AT(data + 8) // design size <= range end
- && USHORT_AT(data + 6) < USHORT_AT(data + 8) // range start < range end
- && USHORT_AT(data + 4) >= 256 // menu name ID >= 256
- && USHORT_AT(data + 4) <= 32767 // menu name ID <= 32767
- && name.english_name(USHORT_AT(data + 4))) // menu name ID is a name ID defined by the font
+ if (USHORT_AT(data + 6) >= USHORT_AT(data + 8) // range start >= range end
+ || USHORT_AT(data + 4) < 256 // menu name ID < 256
+ || USHORT_AT(data + 4) > 32767 // menu name ID > 32767
+ || !name.english_name(USHORT_AT(data + 4))) // menu name ID is a name ID defined by the font
+ continue;
+ if (USHORT_AT(data) + 1 >= USHORT_AT(data + 6) // design size >= range start (with 1 dp grace)
+ && USHORT_AT(data) <= USHORT_AT(data + 8) + 1) // design size <= range end (with 1 dp grace)
+ return s;
+ else if (i == 1 // old-style feature
+ && USHORT_AT(data + 8) <= 1440 // range end <= 144 point
+ && USHORT_AT(data) <= 1440) { // design size <= 144 point
+ // some old fonts define a bogus feature with design size
+ // not in range (John Owens, Read Roberts)
+ if (errh)
+ errh->warning("invalid 'size' feature: design size not in range");
return s;
+ }
}
if (errh)
errh->error("no valid 'size' feature data in the 'size' feature");
diff --git a/Build/source/utils/lcdf-typetools/libefont/otfcmap.cc b/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc
index 97e655ec2b3..d1b24f33872 100644
--- a/Build/source/utils/lcdf-typetools/libefont/otfcmap.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc
@@ -67,9 +67,24 @@ Cmap::parse_header(ErrorHandler *errh)
int platform = USHORT_AT(data + loc);
int encoding = USHORT_AT(data + loc + 2);
uint32_t offset = ULONG_AT(data + loc + 4);
- if (offset + 6 > (uint32_t) len || USHORT_AT(data + offset + 2) < 6)
+ if (offset + 8 > (uint32_t) len) {
+ length_error:
return errh->error("encoding data for entry %d out of range", i);
- int language = USHORT_AT(data + offset + 4);
+ }
+ int format = USHORT_AT(data + offset);
+ int language;
+ if (format == F_BYTE || format == F_HIBYTE || format == F_SEGMENTED
+ || format == F_TRIMMED) {
+ if (USHORT_AT(data + offset + 2) < 6)
+ goto length_error;
+ language = USHORT_AT(data + offset + 4);
+ } else if (format == F_HIBYTE32 || format == F_TRIMMED32
+ || format == F_SEGMENTED32) {
+ if (offset + 12 > (uint32_t) len || ULONG_AT(data + offset + 4) < 12)
+ goto length_error;
+ language = ULONG_AT(data + offset + 8);
+ } else
+ continue;
if (!(platform > last_platform
|| (platform == last_platform
&& (encoding > last_encoding
diff --git a/Build/source/utils/lcdf-typetools/libefont/otfdata.cc b/Build/source/texk/lcdf-typetools/libefont/otfdata.cc
index 9c7afee92ea..9c7afee92ea 100644
--- a/Build/source/utils/lcdf-typetools/libefont/otfdata.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfdata.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/otfdescrip.cc b/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc
index f89ca1ab0e9..f89ca1ab0e9 100644
--- a/Build/source/utils/lcdf-typetools/libefont/otfdescrip.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/otfgpos.cc b/Build/source/texk/lcdf-typetools/libefont/otfgpos.cc
index 612bb1007e0..2b1719adaa3 100644
--- a/Build/source/utils/lcdf-typetools/libefont/otfgpos.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfgpos.cc
@@ -2,7 +2,7 @@
/* otfgpos.{cc,hh} -- OpenType GPOS table
*
- * Copyright (c) 2003-2006 Eddie Kohler
+ * Copyright (c) 2003-2007 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
@@ -84,17 +84,36 @@ GposLookup::GposLookup(const Data &d) throw (Error)
{
if (_d.length() < 6)
throw Format("GPOS Lookup table");
+ _type = _d.u16(0);
+ if (_type == L_EXTENSION && _d.u16(4) != 0) {
+ Data first_subtable = _d.offset_subtable(HEADERSIZE);
+ if (first_subtable.length() < 8 || first_subtable.u16(0) != 1)
+ throw Format("GPOS Extension Lookup table");
+ _type = first_subtable.u16(2);
+ }
+}
+
+Data
+GposLookup::subtable(int i) const
+{
+ Data subd = _d.offset_subtable(HEADERSIZE + i*RECSIZE);
+ if (_d.u16(0) != L_EXTENSION)
+ return subd;
+ else if (subd.length() >= 8 && subd.u16(0) == 1 && subd.u16(2) == _type)
+ return subd.subtable(subd.u32(4));
+ else
+ return Data();
}
bool
GposLookup::unparse_automatics(Vector<Positioning> &v, ErrorHandler *errh) const
{
- int n = _d.u16(4), success = 0;
- switch (_d.u16(0)) {
+ int nlookup = _d.u16(4), success = 0;
+ switch (_type) {
case L_SINGLE:
- for (int i = 0; i < n; i++)
+ for (int i = 0; i < nlookup; i++)
try {
- GposSingle s(_d.offset_subtable(HEADERSIZE + i*RECSIZE));
+ GposSingle s(subtable(i));
s.unparse(v);
success++;
} catch (Error e) {
@@ -103,9 +122,9 @@ GposLookup::unparse_automatics(Vector<Positioning> &v, ErrorHandler *errh) const
}
return success > 0;
case L_PAIR:
- for (int i = 0; i < n; i++)
+ for (int i = 0; i < nlookup; i++)
try {
- GposPair p(_d.offset_subtable(HEADERSIZE + i*RECSIZE));
+ GposPair p(subtable(i));
p.unparse(v);
success++;
} catch (Error e) {
diff --git a/Build/source/utils/lcdf-typetools/libefont/otfgsub.cc b/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
index 001887c8fee..c993af1ce4d 100644
--- a/Build/source/utils/lcdf-typetools/libefont/otfgsub.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
@@ -2,7 +2,7 @@
/* otfgsub.{cc,hh} -- OpenType GSUB table
*
- * Copyright (c) 2003-2006 Eddie Kohler
+ * Copyright (c) 2003-2007 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
@@ -619,39 +619,58 @@ GsubLookup::GsubLookup(const Data &d) throw (Error)
{
if (_d.length() < 6)
throw Format("GSUB Lookup table");
+ _type = _d.u16(0);
+ if (_type == L_EXTENSION && _d.u16(4) != 0) {
+ Data first_subtable = _d.offset_subtable(HEADERSIZE);
+ if (first_subtable.length() < 8 || first_subtable.u16(0) != 1)
+ throw Format("GSUB Extension Lookup table");
+ _type = first_subtable.u16(2);
+ }
+}
+
+Data
+GsubLookup::subtable(int i) const
+{
+ Data subd = _d.offset_subtable(HEADERSIZE + i*RECSIZE);
+ if (_d.u16(0) != L_EXTENSION)
+ return subd;
+ else if (subd.length() >= 8 && subd.u16(0) == 1 && subd.u16(2) == _type)
+ return subd.subtable(subd.u32(4));
+ else
+ return Data();
}
bool
GsubLookup::unparse_automatics(const Gsub &gsub, Vector<Substitution> &v) const
{
int nlookup = _d.u16(4);
- switch (_d.u16(0)) {
+ switch (_type) {
case L_SINGLE:
for (int i = 0; i < nlookup; i++)
- GsubSingle(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).unparse(v);
+ GsubSingle(subtable(i)).unparse(v);
return true;
case L_MULTIPLE:
for (int i = 0; i < nlookup; i++)
- GsubMultiple(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).unparse(v);
+ GsubMultiple(subtable(i)).unparse(v);
return true;
case L_ALTERNATE:
for (int i = 0; i < nlookup; i++)
- GsubMultiple(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).unparse(v, true);
+ GsubMultiple(subtable(i)).unparse(v, true);
return true;
case L_LIGATURE:
for (int i = 0; i < nlookup; i++)
- GsubLigature(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).unparse(v);
+ GsubLigature(subtable(i)).unparse(v);
return true;
case L_CONTEXT: {
bool understood = true;
for (int i = 0; i < nlookup; i++)
- understood &= GsubContext(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).unparse(gsub, v);
+ understood &= GsubContext(subtable(i)).unparse(gsub, v);
return understood;
}
case L_CHAIN: {
bool understood = true;
for (int i = 0; i < nlookup; i++)
- understood &= GsubChainContext(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).unparse(gsub, v);
+ understood &= GsubChainContext(subtable(i)).unparse(gsub, v);
return understood;
}
default:
@@ -663,25 +682,25 @@ bool
GsubLookup::apply(const Glyph *g, int pos, int n, Substitution &s) const
{
int nlookup = _d.u16(4);
- switch (_d.u16(0)) {
+ switch (_type) {
case L_SINGLE:
for (int i = 0; i < nlookup; i++)
- if (GsubSingle(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).apply(g, pos, n, s))
+ if (GsubSingle(subtable(i)).apply(g, pos, n, s))
return true;
return false;
case L_MULTIPLE:
for (int i = 0; i < nlookup; i++)
- if (GsubMultiple(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).apply(g, pos, n, s))
+ if (GsubMultiple(subtable(i)).apply(g, pos, n, s))
return true;
return false;
case L_ALTERNATE:
for (int i = 0; i < nlookup; i++)
- if (GsubMultiple(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).apply(g, pos, n, s, true))
+ if (GsubMultiple(subtable(i)).apply(g, pos, n, s, true))
return true;
return false;
case L_LIGATURE:
for (int i = 0; i < nlookup; i++)
- if (GsubLigature(_d.offset_subtable(HEADERSIZE + i*RECSIZE)).apply(g, pos, n, s))
+ if (GsubLigature(subtable(i)).apply(g, pos, n, s))
return true;
return false;
default: // XXX
diff --git a/Build/source/utils/lcdf-typetools/libefont/otfname.cc b/Build/source/texk/lcdf-typetools/libefont/otfname.cc
index 58de17610f7..58de17610f7 100644
--- a/Build/source/utils/lcdf-typetools/libefont/otfname.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfname.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/otfos2.cc b/Build/source/texk/lcdf-typetools/libefont/otfos2.cc
index 094387548a7..094387548a7 100644
--- a/Build/source/utils/lcdf-typetools/libefont/otfos2.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfos2.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/otfpost.cc b/Build/source/texk/lcdf-typetools/libefont/otfpost.cc
index 37358095a8c..37358095a8c 100644
--- a/Build/source/utils/lcdf-typetools/libefont/otfpost.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfpost.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/pairop.cc b/Build/source/texk/lcdf-typetools/libefont/pairop.cc
index b2a5ce1f7bb..b2a5ce1f7bb 100644
--- a/Build/source/utils/lcdf-typetools/libefont/pairop.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/pairop.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/psres.cc b/Build/source/texk/lcdf-typetools/libefont/psres.cc
index adb0e992617..adb0e992617 100644
--- a/Build/source/utils/lcdf-typetools/libefont/psres.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/psres.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1bounds.cc b/Build/source/texk/lcdf-typetools/libefont/t1bounds.cc
index a9cff1585cb..a9cff1585cb 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1bounds.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1bounds.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1cs.cc b/Build/source/texk/lcdf-typetools/libefont/t1cs.cc
index c8907b270c5..dc35b8659e8 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1cs.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1cs.cc
@@ -339,6 +339,12 @@ CharstringProgram::font_matrix(double matrix[6]) const
matrix[1] = matrix[2] = matrix[4] = matrix[5] = 0;
}
+int
+CharstringProgram::units_per_em() const
+{
+ return 1000;
+}
+
void
CharstringProgram::glyph_names(Vector<PermString> &gnames) const
{
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1csgen.cc b/Build/source/texk/lcdf-typetools/libefont/t1csgen.cc
index 04218de5855..c491e1952b4 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1csgen.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1csgen.cc
@@ -2,7 +2,7 @@
/* t1csgen.{cc,hh} -- Type 1 charstring generation
*
- * Copyright (c) 1998-2006 Eddie Kohler
+ * Copyright (c) 1998-2007 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
@@ -163,7 +163,7 @@ Type1CharstringGen::gen_stack(CharstringInterp &interp, int for_cmd)
}
void
-Type1CharstringGen::gen_moveto(const Point &p, bool closepath)
+Type1CharstringGen::gen_moveto(const Point &p, bool closepath, bool always)
{
// make sure we generate some moveto on the first command
@@ -172,7 +172,7 @@ Type1CharstringGen::gen_moveto(const Point &p, bool closepath)
int big_dx = (int)floor(dx * _f_precision + 0.50001);
int big_dy = (int)floor(dy * _f_precision + 0.50001);
- if (big_dx == 0 && big_dy == 0 && _state != S_INITIAL)
+ if (big_dx == 0 && big_dy == 0 && _state != S_INITIAL && !always)
/* do nothing */;
else {
if (closepath)
@@ -391,7 +391,7 @@ Type1CharstringGenInterp::act_line(int cmd, const Point &a, const Point &b)
gen_sbw(false);
else if (_in_hr)
act_hintmask(cmd, 0, nhints());
- _csgen.gen_moveto(a, _state == S_OPEN);
+ _csgen.gen_moveto(a, _state == S_OPEN, false);
_state = S_OPEN;
if (a.x == b.x) {
gen_number(b.y - a.y, 'y');
@@ -413,7 +413,7 @@ Type1CharstringGenInterp::act_curve(int cmd, const Point &a, const Point &b, con
gen_sbw(false);
else if (_in_hr)
act_hintmask(cmd, 0, nhints());
- _csgen.gen_moveto(a, _state == S_OPEN);
+ _csgen.gen_moveto(a, _state == S_OPEN, false);
_state = S_OPEN;
if (b.y == a.y && d.x == c.x) {
gen_number(b.x - a.x, 'x');
@@ -445,7 +445,7 @@ Type1CharstringGenInterp::act_flex(int cmd, const Point &p0, const Point &p1, co
gen_sbw(false);
else if (_in_hr)
act_hintmask(cmd, 0, nhints());
- _csgen.gen_moveto(p0, _state == S_OPEN);
+ _csgen.gen_moveto(p0, _state == S_OPEN, false);
_state = S_OPEN;
// 1. Outer endpoints must have same x (or y) coordinate
@@ -484,31 +484,31 @@ Type1CharstringGenInterp::act_flex(int cmd, const Point &p0, const Point &p1, co
_csgen.gen_number(1);
_csgen.gen_command(Cs::cCallsubr);
- _csgen.gen_moveto(p_reference, false);
+ _csgen.gen_moveto(p_reference, false, true);
_csgen.gen_number(2);
_csgen.gen_command(Cs::cCallsubr);
- _csgen.gen_moveto(p1, false);
+ _csgen.gen_moveto(p1, false, true);
_csgen.gen_number(2);
_csgen.gen_command(Cs::cCallsubr);
- _csgen.gen_moveto(p2, false);
+ _csgen.gen_moveto(p2, false, true);
_csgen.gen_number(2);
_csgen.gen_command(Cs::cCallsubr);
- _csgen.gen_moveto(p3_4, false);
+ _csgen.gen_moveto(p3_4, false, true);
_csgen.gen_number(2);
_csgen.gen_command(Cs::cCallsubr);
- _csgen.gen_moveto(p5, false);
+ _csgen.gen_moveto(p5, false, true);
_csgen.gen_number(2);
_csgen.gen_command(Cs::cCallsubr);
- _csgen.gen_moveto(p6, false);
+ _csgen.gen_moveto(p6, false, true);
_csgen.gen_number(2);
_csgen.gen_command(Cs::cCallsubr);
- _csgen.gen_moveto(p7, false);
+ _csgen.gen_moveto(p7, false, true);
_csgen.gen_number(2);
_csgen.gen_command(Cs::cCallsubr);
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1font.cc b/Build/source/texk/lcdf-typetools/libefont/t1font.cc
index 068002db58f..068002db58f 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1font.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1font.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1fontskel.cc b/Build/source/texk/lcdf-typetools/libefont/t1fontskel.cc
index 5b717a0be37..6f7835e4212 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1fontskel.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1fontskel.cc
@@ -1,6 +1,6 @@
-/* t1fontskel.{cc,hh} -- Type 1 font skeleton
+/* t1fontskel.cc -- Type 1 font skeleton
*
- * Copyright (c) 1998-2006 Eddie Kohler
+ * Copyright (c) 1998-2007 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
@@ -333,7 +333,7 @@ font_dict_string(const Type1Font *font, int dict, PermString name)
}
Type1Font *
-Type1Font::skeleton_make_copy(const Type1Font *font, PermString font_name)
+Type1Font::skeleton_make_copy(const Type1Font *font, PermString font_name, const Vector<double> *xuid_extension)
{
String version = font_dict_string(font, dFI, "version");
Type1Font *output = skeleton_make(font_name, version);
@@ -380,8 +380,28 @@ Type1Font::skeleton_make_copy(const Type1Font *font, PermString font_name)
add_number_def(output, dF, "FontType", font);
add_copy_def(output, dF, "FontMatrix", font, "readonly def");
add_number_def(output, dF, "StrokeWidth", font);
- add_number_def(output, dF, "UniqueID", font);
+ if (!xuid_extension)
+ add_number_def(output, dF, "UniqueID", font);
add_copy_def(output, dF, "XUID", font, "readonly def");
+ if (xuid_extension) {
+ Vector<double> xuid;
+ if (Type1Definition *xuid_def = output->dict("XUID"))
+ xuid_def->value_numvec(xuid);
+ if (!xuid.size()) {
+ Type1Definition *uid_def = font->dict("UniqueID");
+ int uid;
+ if (uid_def && uid_def->value_int(uid)) {
+ xuid.push_back(1);
+ xuid.push_back(uid);
+ }
+ }
+ if (xuid.size()) {
+ for (int i = 0; i < xuid_extension->size(); i++)
+ xuid.push_back((*xuid_extension)[i]);
+ Type1Definition *xuid_def = output->ensure(dF, "XUID");
+ xuid_def->set_numvec(xuid);
+ }
+ }
add_copy_def(output, dF, "FontBBox", font, "readonly def");
output->skeleton_fontdict_end();
@@ -400,7 +420,8 @@ Type1Font::skeleton_make_copy(const Type1Font *font, PermString font_name)
add_copy_def(output, dP, "ForceBold", font);
add_number_def(output, dP, "LanguageGroup", font);
add_number_def(output, dP, "ExpansionFactor", font);
- add_number_def(output, dP, "UniqueID", font);
+ if (!xuid_extension)
+ add_number_def(output, dP, "UniqueID", font);
output->add_definition(dP, Type1Definition::make_literal("MinFeature", "{16 16}", "|-"));
output->add_definition(dP, Type1Definition::make_literal("password", "5839", "def"));
output->add_definition(dP, Type1Definition::make_literal("lenIV", "0", "def"));
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1interp.cc b/Build/source/texk/lcdf-typetools/libefont/t1interp.cc
index 478235dd158..478235dd158 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1interp.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1interp.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1item.cc b/Build/source/texk/lcdf-typetools/libefont/t1item.cc
index ee71a3af92d..ee71a3af92d 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1item.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1item.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1mm.cc b/Build/source/texk/lcdf-typetools/libefont/t1mm.cc
index 8743479e4fa..8743479e4fa 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1mm.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1mm.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1rw.cc b/Build/source/texk/lcdf-typetools/libefont/t1rw.cc
index 152084c8ec4..152084c8ec4 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1rw.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1rw.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/t1unparser.cc b/Build/source/texk/lcdf-typetools/libefont/t1unparser.cc
index a976155341e..a976155341e 100644
--- a/Build/source/utils/lcdf-typetools/libefont/t1unparser.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1unparser.cc
diff --git a/Build/source/utils/lcdf-typetools/libefont/ttfcs.cc b/Build/source/texk/lcdf-typetools/libefont/ttfcs.cc
index b2cd1a1af12..1a08e1f85a8 100644
--- a/Build/source/utils/lcdf-typetools/libefont/ttfcs.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/ttfcs.cc
@@ -2,7 +2,7 @@
/* ttfcs.{cc,hh} -- TrueType "charstring" emulation
*
- * Copyright (c) 2006 Eddie Kohler
+ * Copyright (c) 2006-2007 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,6 +17,7 @@
# include <config.h>
#endif
#include <efont/ttfcs.hh>
+#include <efont/ttfhead.hh>
#include <efont/t1csgen.hh>
#include <efont/otfpost.hh>
#include <efont/otfcmap.hh>
@@ -24,7 +25,7 @@
namespace Efont {
TrueTypeBoundsCharstringProgram::TrueTypeBoundsCharstringProgram(const OpenType::Font *otf)
- : _otf(otf), _nglyphs(-1), _loca_long(false), _em_xform(1000. / 1024),
+ : _otf(otf), _nglyphs(-1), _loca_long(false), _units_per_em(1024),
_loca(otf->table("loca")), _glyf(otf->table("glyf")),
_hmtx(otf->table("hmtx")), _got_glyph_names(false), _got_unicodes(false)
{
@@ -32,30 +33,10 @@ TrueTypeBoundsCharstringProgram::TrueTypeBoundsCharstringProgram(const OpenType:
if (maxp.length() >= 6)
_nglyphs = maxp.u16(4);
- OpenType::Data head(otf->table("head"));
- // HEAD format:
- // 0 Fixed Table version number 0x00010000 (ver. 1.0)
- // 4 Fixed fontRevision
- // 8 ULONG checkSumAdjustment
- // 12 ULONG magicNumber Set to 0x5F0F3CF5
- // 16 USHORT flags
- // 18 USHORT unitsPerEm
- // 20 LONGDATETIME created
- // 28 LONGDATETIME modified
- // 36 USHORT xMin
- // 38 SHORT yMin
- // 40 SHORT xMax
- // 42 SHORT yMax
- // 44 USHORT macStyle
- // 46 USHORT lowestRecPPEM
- // 48 SHORT fontDirectionHint
- // 50 SHORT indexToLocFormat
- // 52 SHORT glyphDataFormat
- if (head.length() >= 54
- && head.u32(0) == 0x10000
- && head.u32(12) == 0x5F0F3CF5) {
- _loca_long = head.u16(50) != 0;
- _em_xform = 1000. / (double) head.u16(18);
+ OpenType::Head head(otf->table("head"), 0);
+ if (head.ok()) {
+ _loca_long = head.index_to_loc_format() != 0;
+ _units_per_em = head.units_per_em();
}
if (_loca_long)
_loca.align_long();
@@ -97,6 +78,12 @@ TrueTypeBoundsCharstringProgram::~TrueTypeBoundsCharstringProgram()
}
int
+TrueTypeBoundsCharstringProgram::units_per_em() const
+{
+ return _units_per_em;
+}
+
+int
TrueTypeBoundsCharstringProgram::nglyphs() const
{
return _nglyphs;
@@ -199,17 +186,17 @@ TrueTypeBoundsCharstringProgram::glyph(int gi) const
Type1CharstringGen gen;
if (ncontours == 0) {
gen.gen_number(0, 'X');
- gen.gen_number(advance_width * _em_xform);
+ gen.gen_number(advance_width);
gen.gen_command(Charstring::cHsbw);
} else {
- gen.gen_number(lsb * _em_xform, 'X');
- gen.gen_number(advance_width * _em_xform);
+ gen.gen_number(lsb, 'X');
+ gen.gen_number(advance_width);
gen.gen_command(Charstring::cHsbw);
- gen.gen_moveto(Point(xmin * _em_xform, ymin * _em_xform), false);
+ gen.gen_moveto(Point(xmin, ymin), false, false);
if (xmax != xmin || ymax == ymin)
- gen.gen_number((xmax - xmin) * _em_xform, 'x');
+ gen.gen_number(xmax - xmin, 'x');
if (ymax != ymin)
- gen.gen_number((ymax - ymin) * _em_xform, 'y');
+ gen.gen_number(ymax - ymin, 'y');
gen.gen_command(ymax == ymin ? Charstring::cHlineto
: (xmax == xmin ? Charstring::cVlineto
: Charstring::cRlineto));
diff --git a/Build/source/texk/lcdf-typetools/libefont/ttfhead.cc b/Build/source/texk/lcdf-typetools/libefont/ttfhead.cc
new file mode 100644
index 00000000000..9f41714fc3d
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/libefont/ttfhead.cc
@@ -0,0 +1,69 @@
+// -*- related-file-name: "../include/efont/ttfhead.hh" -*-
+
+/* ttfhead.{cc,hh} -- TrueType head table
+ *
+ * Copyright (c) 2007 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
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version. This program is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <efont/ttfhead.hh>
+#include <lcdf/error.hh>
+#include <lcdf/straccum.hh>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+
+namespace Efont { namespace OpenType {
+
+Head::Head(const String &s, ErrorHandler *errh)
+ : _d(s)
+{
+ _error = parse_header(errh ? errh : ErrorHandler::ignore_handler());
+}
+
+int
+Head::parse_header(ErrorHandler *errh)
+{
+ // HEAD format:
+ // 0 Fixed Table version number 0x00010000 (ver. 1.0)
+ // 4 Fixed fontRevision
+ // 8 ULONG checkSumAdjustment
+ // 12 ULONG magicNumber Set to 0x5F0F3CF5
+ // 16 USHORT flags
+ // 18 USHORT unitsPerEm
+ // 20 LONGDATETIME created
+ // 28 LONGDATETIME modified
+ // 36 USHORT xMin
+ // 38 SHORT yMin
+ // 40 SHORT xMax
+ // 42 SHORT yMax
+ // 44 USHORT macStyle
+ // 46 USHORT lowestRecPPEM
+ // 48 SHORT fontDirectionHint
+ // 50 SHORT indexToLocFormat
+ // 52 SHORT glyphDataFormat
+ int len = _d.length();
+ const uint8_t *data = _d.udata();
+ if (len == 0)
+ return errh->error("font has no 'head' table"), -EFAULT;
+ if (54 > len)
+ return errh->error("'head' table too small"), -EFAULT;
+ if (!(data[0] == '\000' && data[1] == '\001'))
+ return errh->error("bad 'head' version number"), -ERANGE;
+ if (_d.u32(12) != 0x5F0F3CF5)
+ return errh->error("bad 'head' magic number"), -ERANGE;
+ return 0;
+}
+
+}}
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/Makefile.am b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.am
index 6531d5186e5..6531d5186e5 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
index 0e46cb1c67c..0e46cb1c67c 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/bezier.cc b/Build/source/texk/lcdf-typetools/liblcdf/bezier.cc
index 54402c90276..54402c90276 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/bezier.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/bezier.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/liblcdf/clp.c
index aa99f34f40e..aa99f34f40e 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/clp.c
+++ b/Build/source/texk/lcdf-typetools/liblcdf/clp.c
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/liblcdf/error.cc
index 2602f460bca..2602f460bca 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/error.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/error.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/filename.cc b/Build/source/texk/lcdf-typetools/liblcdf/filename.cc
index fcd8e89029a..fcd8e89029a 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/filename.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/filename.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/fixlibc.c b/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c
index 85b13251fd4..85b13251fd4 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/fixlibc.c
+++ b/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/globmatch.cc b/Build/source/texk/lcdf-typetools/liblcdf/globmatch.cc
index 023a8f2a4ca..023a8f2a4ca 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/globmatch.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/globmatch.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/landmark.cc b/Build/source/texk/lcdf-typetools/liblcdf/landmark.cc
index 339ae4ac98e..339ae4ac98e 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/landmark.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/landmark.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/md5.c b/Build/source/texk/lcdf-typetools/liblcdf/md5.c
index ecacfadd3bc..ecacfadd3bc 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/md5.c
+++ b/Build/source/texk/lcdf-typetools/liblcdf/md5.c
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/permstr.cc b/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc
index c977364cd31..421714a0e35 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/permstr.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/permstr.cc
@@ -230,8 +230,7 @@ vpermprintf(const char *s, va_list val)
case '1': case '2': case '3': case '4': case '5':
case '6': case '7': case '8': case '9':
- if (iflag != -1)
- assert(0 && "Too many decimal flags in permprintf");
+ assert(iflag == -1 /* Too many decimal flags in permprintf */);
iflag = 0;
while (*s >= '0' && *s <= '9') {
iflag = iflag * 10 + *s - '0';
@@ -239,12 +238,10 @@ vpermprintf(const char *s, va_list val)
}
break;
- case '*': {
- if (iflag != -1)
- assert(0 && "iflag given");
- iflag = va_arg(val, int);
- break;
- }
+ case '*':
+ assert(iflag == -1 /* iflag given */);
+ iflag = va_arg(val, int);
+ break;
case 's': {
const char *x = va_arg(val, const char *);
@@ -317,7 +314,7 @@ vpermprintf(const char *s, va_list val)
}
default:
- assert(0 && "Bad % in permprintf");
+ assert(0 /* Bad % in permprintf */);
goto pctdone;
}
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/point.cc b/Build/source/texk/lcdf-typetools/liblcdf/point.cc
index c39ff60ac77..c39ff60ac77 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/point.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/point.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/slurper.cc b/Build/source/texk/lcdf-typetools/liblcdf/slurper.cc
index 54905b8bdbd..54905b8bdbd 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/slurper.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/slurper.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/straccum.cc b/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc
index 1f4020cfce4..1f4020cfce4 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/straccum.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/liblcdf/string.cc
index 8bcf1596304..8bcf1596304 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/string.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/string.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/strtonum.c b/Build/source/texk/lcdf-typetools/liblcdf/strtonum.c
index b4bad23241d..b4bad23241d 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/strtonum.c
+++ b/Build/source/texk/lcdf-typetools/liblcdf/strtonum.c
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/transform.cc b/Build/source/texk/lcdf-typetools/liblcdf/transform.cc
index b59da9de99a..b59da9de99a 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/transform.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/transform.cc
diff --git a/Build/source/utils/lcdf-typetools/liblcdf/vectorv.cc b/Build/source/texk/lcdf-typetools/liblcdf/vectorv.cc
index 26dc1a05a66..26dc1a05a66 100644
--- a/Build/source/utils/lcdf-typetools/liblcdf/vectorv.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/vectorv.cc
diff --git a/Build/source/utils/lcdf-typetools/missing b/Build/source/texk/lcdf-typetools/missing
index 894e786e16c..894e786e16c 100644..100755
--- a/Build/source/utils/lcdf-typetools/missing
+++ b/Build/source/texk/lcdf-typetools/missing
diff --git a/Build/source/utils/lcdf-typetools/mmafm/Makefile.am b/Build/source/texk/lcdf-typetools/mmafm/Makefile.am
index 4d535e5cfbd..4d535e5cfbd 100644
--- a/Build/source/utils/lcdf-typetools/mmafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/mmafm/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
index 7fc3afae05c..7fc3afae05c 100644
--- a/Build/source/utils/lcdf-typetools/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/mmafm/main.cc b/Build/source/texk/lcdf-typetools/mmafm/main.cc
index 8c04fecf160..8c04fecf160 100644
--- a/Build/source/utils/lcdf-typetools/mmafm/main.cc
+++ b/Build/source/texk/lcdf-typetools/mmafm/main.cc
diff --git a/Build/source/utils/lcdf-typetools/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1
index db1f3264fd3..780e1b6d2a4 100644
--- a/Build/source/utils/lcdf-typetools/mmafm/mmafm.1
+++ b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/Makefile.am b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.am
index 5d579edca5c..5d579edca5c 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
index 764d39a37e9..764d39a37e9 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/main.cc b/Build/source/texk/lcdf-typetools/mmpfb/main.cc
index b323882ecbd..b323882ecbd 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/main.cc
+++ b/Build/source/texk/lcdf-typetools/mmpfb/main.cc
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1
index dc13d53aa9d..6cba4d26d3a 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/mmpfb.1
+++ b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/myfont.cc b/Build/source/texk/lcdf-typetools/mmpfb/myfont.cc
index 9816daefe47..9816daefe47 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/myfont.cc
+++ b/Build/source/texk/lcdf-typetools/mmpfb/myfont.cc
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/myfont.hh b/Build/source/texk/lcdf-typetools/mmpfb/myfont.hh
index 9b29a9f4111..9b29a9f4111 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/myfont.hh
+++ b/Build/source/texk/lcdf-typetools/mmpfb/myfont.hh
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/t1minimize.cc b/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.cc
index 71e95f6b744..4d970a15c7d 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/t1minimize.cc
+++ b/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.cc
@@ -20,14 +20,12 @@
using namespace Efont;
-/*****
- * main
- **/
-
Type1Font *
minimize(Type1Font *font)
{
- Type1Font *output = Type1Font::skeleton_make_copy(font, font->font_name());
+ Vector<double> xuid_extension;
+ xuid_extension.push_back(0x000395C1);
+ Type1Font *output = Type1Font::skeleton_make_copy(font, font->font_name(), &xuid_extension);
// Subrs
for (int i = 0; i < font->nsubrs(); i++)
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/t1minimize.hh b/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.hh
index a5c3ea04906..a5c3ea04906 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/t1minimize.hh
+++ b/Build/source/texk/lcdf-typetools/mmpfb/t1minimize.hh
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/t1rewrit.cc b/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.cc
index 2c402964626..2c402964626 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/t1rewrit.cc
+++ b/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.cc
diff --git a/Build/source/utils/lcdf-typetools/mmpfb/t1rewrit.hh b/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.hh
index 238f93dc630..238f93dc630 100644
--- a/Build/source/utils/lcdf-typetools/mmpfb/t1rewrit.hh
+++ b/Build/source/texk/lcdf-typetools/mmpfb/t1rewrit.hh
diff --git a/Build/source/utils/lcdf-typetools/otfinfo/Makefile.am b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.am
index c1541be0c33..c1541be0c33 100644
--- a/Build/source/utils/lcdf-typetools/otfinfo/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
index 72bab8988ed..72bab8988ed 100644
--- a/Build/source/utils/lcdf-typetools/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1
index d4ebd306406..5a266eba944 100644
--- a/Build/source/utils/lcdf-typetools/otfinfo/otfinfo.1
+++ b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/utils/lcdf-typetools/otfinfo/otfinfo.cc b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc
index c76321b117e..c76321b117e 100644
--- a/Build/source/utils/lcdf-typetools/otfinfo/otfinfo.cc
+++ b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/Makefile.am b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.am
index 18f4e88c302..18f4e88c302 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
index 71a5259ac27..71a5259ac27 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc
index 5796ee281af..5796ee281af 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/automatic.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/automatic.hh b/Build/source/texk/lcdf-typetools/otftotfm/automatic.hh
index 5bd8d04a974..5bd8d04a974 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/automatic.hh
+++ b/Build/source/texk/lcdf-typetools/otftotfm/automatic.hh
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/dvipsencoding.cc b/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc
index 1cc18a9a870..3390da44971 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/dvipsencoding.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc
@@ -1,6 +1,6 @@
/* dvipsencoding.{cc,hh} -- store a DVIPS encoding
*
- * Copyright (c) 2003-2006 Eddie Kohler
+ * Copyright (c) 2003-2007 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
@@ -424,7 +424,7 @@ DvipsEncoding::parse_position_words(Vector<String> &v, int override, ErrorHandle
if (v.size() != 4)
return -EPARSE;
- int c = encoding_of(v[0], override > 0);
+ int c = encoding_of(v[0]);
if (c < 0)
return (override > 0 ? errh->warning("'%s' has no encoding, ignoring positioning", v[0].c_str()) : -1);
@@ -452,7 +452,7 @@ DvipsEncoding::parse_unicoding_words(Vector<String> &v, int override, ErrorHandl
if (v.size() < 2 || (v[1] != "=" && v[1] != "=:" && v[1] != ":="))
return -EPARSE;
else if (v[0] == "||" || (av = encoding_of(v[0])) < 0)
- return errh->error("target '%s' has no encoding, ignoring UNICODING", v[0].c_str());
+ return errh->warning("'%s' has no encoding, ignoring UNICODING", v[0].c_str());
int original_size = _unicoding.size();
@@ -690,7 +690,7 @@ DvipsEncoding::bad_codepoint(int code, Metrics &metrics, Vector<String> &unencod
Vector<Setting> v;
v.push_back(Setting(Setting::RULE, 500, 500));
v.push_back(Setting(Setting::SPECIAL, String("Warning: missing glyph '") + _e[code] + "'"));
- metrics.encode_virtual(code, _e[code], 0, v);
+ metrics.encode_virtual(code, _e[code], 0, v, true);
unencoded.push_back(_e[code]);
}
}
@@ -838,6 +838,27 @@ DvipsEncoding::make_metrics(Metrics &metrics, const FontInfo &finfo, Secondary *
metrics.set_coding_scheme(_coding_scheme);
}
+void
+DvipsEncoding::make_base_mappings(Vector<int> &mappings, const FontInfo &finfo)
+{
+ mappings.clear();
+ for (int code = 0; code < _e.size(); code++) {
+ PermString chname = _e[code];
+
+ // common case: skip .notdef
+ if (chname == dot_notdef)
+ continue;
+
+ // find named glyph
+ Efont::OpenType::Glyph named_glyph = finfo.glyphid(chname);
+ if (named_glyph > 0) {
+ if (mappings.size() <= named_glyph)
+ mappings.resize(named_glyph + 1, -1);
+ mappings[named_glyph] = code;
+ }
+ }
+}
+
void
DvipsEncoding::apply_ligkern_lig(Metrics &metrics, ErrorHandler *errh) const
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/dvipsencoding.hh b/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.hh
index 831873675b6..62512b2ef12 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/dvipsencoding.hh
+++ b/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.hh
@@ -27,6 +27,7 @@ class DvipsEncoding { public:
inline int encoding_of(PermString) const;
int encoding_of(PermString, bool encode);
inline bool encoded(int e) const;
+ inline PermString encoding(int e) const;
int encoding_size() const { return _e.size(); }
int parse(String filename, bool ignore_ligkern, bool ignore_other, ErrorHandler *);
@@ -38,6 +39,7 @@ class DvipsEncoding { public:
// also modifies 'this':
void make_metrics(Metrics &, const FontInfo &, Secondary *, bool literal, ErrorHandler *);
+ void make_base_mappings(Vector<int> &mappings, const FontInfo &);
void apply_ligkern_lig(Metrics &, ErrorHandler *) const;
void apply_ligkern_kern(Metrics &, ErrorHandler *) const;
@@ -106,6 +108,15 @@ DvipsEncoding::encoded(int e) const
return e >= 0 && e < _e.size() && _e[e] != dot_notdef;
}
+inline PermString
+DvipsEncoding::encoding(int e) const
+{
+ if (encoded(e))
+ return _e[e];
+ else
+ return PermString();
+}
+
inline int
DvipsEncoding::encoding_of(PermString what) const
{
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/glyphfilter.cc b/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc
index 832061e7782..832061e7782 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/glyphfilter.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/glyphfilter.hh b/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.hh
index a2ceb40e439..a2ceb40e439 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/glyphfilter.hh
+++ b/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.hh
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/kpseinterface.c b/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.c
index 586c23e5f07..586c23e5f07 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/kpseinterface.c
+++ b/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.c
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/kpseinterface.h b/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.h
index 0809059437b..0809059437b 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/kpseinterface.h
+++ b/Build/source/texk/lcdf-typetools/otftotfm/kpseinterface.h
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/metrics.cc b/Build/source/texk/lcdf-typetools/otftotfm/metrics.cc
index 901638beeb8..8386263ecdc 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/metrics.cc
@@ -1,6 +1,6 @@
/* metrics.{cc,hh} -- an encoding during and after OpenType features
*
- * Copyright (c) 2003-2006 Eddie Kohler
+ * Copyright (c) 2003-2007 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
@@ -25,7 +25,8 @@
Metrics::Metrics(const Efont::CharstringProgram *font, int nglyphs)
: _boundary_glyph(nglyphs), _emptyslot_glyph(nglyphs + 1),
- _design_units(1000), _liveness_marked(false)
+ _design_units(1000), _units_per_em(font->units_per_em()),
+ _liveness_marked(false)
{
_encoding.assign(256, Char());
add_mapped_font(font, String());
@@ -169,13 +170,15 @@ Metrics::encode(Code code, uint32_t uni, Glyph g)
}
void
-Metrics::encode_virtual(Code code, PermString name, uint32_t uni, const Vector<Setting> &v)
+Metrics::encode_virtual(Code code, PermString name, uint32_t uni, const Vector<Setting> &v, bool base_char)
{
assert(code >= 0 && v.size() > 0);
if (code >= _encoding.size())
_encoding.resize(code + 1, Char());
_encoding[code].unicode = uni;
_encoding[code].glyph = VIRTUAL_GLYPH;
+ if (base_char)
+ _encoding[code].flags |= Char::BASE_REP;
assert(!_encoding[code].virtual_char);
VirtualChar *vc = _encoding[code].virtual_char = new VirtualChar;
vc->name = name;
@@ -189,6 +192,25 @@ Metrics::encode_virtual(Code code, PermString name, uint32_t uni, const Vector<S
}
void
+Metrics::apply_base_encoding(const String &font_name, const DvipsEncoding &dvipsenc, const Vector<int> &mapping)
+{
+ int font_number = -1;
+ for (Char *c = _encoding.begin(); c != _encoding.end(); c++)
+ if (c->glyph > 0 && !c->virtual_char && c->glyph < mapping.size()
+ && mapping[c->glyph] >= 0) {
+ if (font_number < 0)
+ font_number = add_mapped_font(mapped_font(0), font_name);
+ VirtualChar *vc = c->virtual_char = new VirtualChar;
+ vc->name = dvipsenc.encoding(mapping[c->glyph]);
+ vc->setting.push_back(Setting(Setting::FONT, font_number));
+ vc->setting.push_back(Setting(Setting::SHOW, mapping[c->glyph], c->glyph));
+ c->glyph = VIRTUAL_GLYPH;
+ c->base_code = -1;
+ c->flags = (c->flags & ~Char::BASE_LIVE) | Char::BASE_REP;
+ }
+}
+
+void
Metrics::add_altselector_code(Code code, int altselector_type)
{
for (Kern *k = _altselectors.begin(); k != _altselectors.end(); k++)
@@ -199,13 +221,17 @@ Metrics::add_altselector_code(Code code, int altselector_type)
_altselectors.push_back(Kern(code, altselector_type));
}
-void
-Metrics::base_glyphs(Vector<Glyph> &v) const
+bool
+Metrics::base_glyphs(Vector<Glyph> &v, int size) const
{
+ bool any = false;
v.assign(_encoding.size(), 0);
- for (Code c = 0; c < _encoding.size(); c++)
- if (_encoding[c].base_code >= 0)
- v[_encoding[c].base_code] = _encoding[c].glyph;
+ for (const Char *ch = _encoding.begin(); ch != _encoding.end(); ch++)
+ if (ch->base_code >= 0 && ch->base_code < size) {
+ v[ch->base_code] = ch->glyph;
+ any = true;
+ }
+ return any;
}
@@ -817,10 +843,17 @@ Metrics::all_ligatures(Vector<Ligature3> &all_ligs) const
}
void
-Metrics::mark_liveness(int size, const Vector<Ligature3> &all_ligs)
+Metrics::mark_liveness(int size, const Vector<Ligature3> *all_ligs)
{
_liveness_marked = true;
bool changed;
+
+ // make sure we have ligatures
+ Vector<Ligature3> my_ligs;
+ if (!all_ligs) {
+ all_ligatures(my_ligs);
+ all_ligs = &my_ligs;
+ }
/* Characters below 'size' are in both virtual and base encodings. */
for (Char *ch = _encoding.begin(); ch < _encoding.begin() + size; ch++)
@@ -829,7 +862,7 @@ Metrics::mark_liveness(int size, const Vector<Ligature3> &all_ligs)
/* Characters reachable from live chars by live ligatures are live. */
redo_live_reachable:
- for (const Ligature3 *l = all_ligs.begin(); l != all_ligs.end(); l++)
+ for (const Ligature3 *l = all_ligs->begin(); l != all_ligs->end(); l++)
if (_encoding[l->in1].flag(Char::LIVE) && _encoding[l->in2].flag(Char::LIVE)) {
Char &ch = _encoding[l->out];
if (!ch.flag(Char::LIVE))
@@ -859,7 +892,8 @@ Metrics::mark_liveness(int size, const Vector<Ligature3> &all_ligs)
if (VirtualChar *vc = ch->virtual_char) {
int font_number = 0;
for (Setting *s = vc->setting.begin(); s != vc->setting.end(); s++)
- if (s->op == Setting::SHOW && font_number == 0)
+ if (s->op == Setting::SHOW && font_number == 0
+ && _encoding[s->x].base_code >= 0)
_encoding[s->x].flags |= Char::BASE_LIVE;
else if (s->op == Setting::FONT)
font_number = s->x;
@@ -917,8 +951,12 @@ Metrics::cut_encoding(int size)
/* Change "emptyslot"s to ".notdef"s. */
for (Char *ch = _encoding.begin(); ch != _encoding.end(); ch++)
- if (ch->glyph == emptyslot_glyph())
- ch->glyph = 0, ch->base_code = -1;
+ if (ch->glyph == emptyslot_glyph()) {
+ ch->glyph = 0;
+ ch->base_code = -1;
+ // 21.Feb.2007: Character isn't live any more.
+ ch->flags &= ~(Char::BASE_LIVE | Char::LIVE);
+ }
/* Maybe we don't need to do anything else. */
if (_encoding.size() <= size) {
@@ -927,11 +965,8 @@ Metrics::cut_encoding(int size)
}
/* Need liveness markings. */
- if (!_liveness_marked) {
- Vector<Ligature3> all_ligs;
- all_ligatures(all_ligs);
- mark_liveness(size, all_ligs);
- }
+ if (!_liveness_marked)
+ mark_liveness(size);
/* Characters below 'size' are 'good'.
Characters above 'size' are not 'good'. */
@@ -1051,7 +1086,7 @@ Metrics::shrink_encoding(int size, const DvipsEncoding &dvipsenc, ErrorHandler *
/* Need liveness markings. */
if (!_liveness_marked)
- mark_liveness(size, all_ligs);
+ mark_liveness(size, &all_ligs);
/* Score characters by importance. Importance relates first to Unicode
values, and then recursively to the importances of characters that form
@@ -1202,28 +1237,21 @@ font, so I've ignored these:\n%s.)", sa.c_str());
void
Metrics::make_base(int size)
{
- if (_encoding.size() <= size)
- /* If the encoding has not grown, there cannot be any base characters
- left to swap in. */
- return;
-
- assert(_encoding.size() > size);
- bool reencoded = false;
Vector<Code> reencoding;
- for (Code c = 0; c < _encoding.size(); c++)
- reencoding.push_back(c);
- for (Code c = 0; c < size; c++) {
+ for (Code c = 0; c < size && c < _encoding.size(); c++) {
Char &ch = _encoding[c];
if (ch.base_code >= 0 && ch.base_code != c) {
+ if (!reencoding.size())
+ for (Code cc = 0; cc < _encoding.size(); cc++)
+ reencoding.push_back(cc);
reencoding[ch.base_code] = c;
reencoding[c] = ch.base_code;
_encoding[c].swap(_encoding[ch.base_code]);
- reencoded = true;
}
if (ch.virtual_char) // remove it
ch.clear();
}
- if (reencoded) {
+ if (reencoding.size()) {
reencode(reencoding);
cut_encoding(size);
}
@@ -1247,8 +1275,21 @@ Metrics::need_virtual(int size) const
}
bool
+Metrics::need_base()
+{
+ if (!_liveness_marked)
+ mark_liveness(_encoding.size());
+ for (const Char *ch = _encoding.begin(); ch < _encoding.end(); ch++)
+ if ((ch->flags & Char::BASE_LIVE) && ch->glyph != _boundary_glyph)
+ return true;
+ return false;
+}
+
+bool
Metrics::setting(Code code, Vector<Setting> &v, SettingMode sm) const
{
+ extern int letterspace;
+
if (!(sm & SET_KEEP))
v.clear();
@@ -1260,6 +1301,10 @@ Metrics::setting(Code code, Vector<Setting> &v, SettingMode sm) const
if (const VirtualChar *vc = ch.virtual_char) {
bool good = true;
int font_number = 0;
+
+ if (ch.pdx != 0 || ch.pdy != 0)
+ v.push_back(Setting(Setting::MOVE, ch.pdx, ch.pdy));
+
for (const Setting *s = vc->setting.begin(); s != vc->setting.end(); s++)
switch (s->op) {
case Setting::MOVE:
@@ -1280,16 +1325,24 @@ Metrics::setting(Code code, Vector<Setting> &v, SettingMode sm) const
v.push_back(*s);
break;
case Setting::KERN:
+ case Setting::KERNX:
if (sm & SET_INTERMEDIATE)
v.push_back(*s);
- else if (s > vc->setting.begin() && s + 1 < vc->setting.end()
+ else if (font_number == 0 && s > vc->setting.begin()
+ && s + 1 < vc->setting.end()
&& s[-1].op == Setting::SHOW
- && s[1].op == Setting::SHOW
- && font_number == 0)
- if (int k = kern(s[-1].x, s[1].x))
+ && s[1].op == Setting::SHOW) {
+ int k = kern(s[-1].x, s[1].x);
+ if (s->op == Setting::KERNX)
+ k -= letterspace;
+ if (k)
v.push_back(Setting(Setting::MOVE, k, 0));
+ }
break;
}
+
+ if (ch.pdy != 0 || ch.adx - ch.pdx != 0)
+ v.push_back(Setting(Setting::MOVE, ch.adx - ch.pdx, -ch.pdy));
return good;
} else if (ch.base_code >= 0) {
@@ -1357,55 +1410,68 @@ Metrics::kerns(Code in1, Vector<Code> &in2, Vector<int> &kern) const
/* debugging */
void
-Metrics::unparse() const
+Metrics::unparse(const Char *ch) const
{
- for (Code c = 0; c < _encoding.size(); c++)
- if (_encoding[c].glyph) {
- const Char &ch = _encoding[c];
- fprintf(stderr, "%4d/%s%s%s%s%s%s\n", c, code_str(c),
- (ch.flag(Char::LIVE) ? " [L]" : ""),
- (ch.flag(Char::BASE_LIVE) ? " [B]" : ""),
- (ch.flag(Char::CONTEXT_ONLY) ? " [C]" : ""),
- (ch.flag(Char::BUILT) ? " [!]" : ""),
- (ch.base_code >= 0 ? " <BC>" : ""));
- if (ch.base_code >= 0 && ch.base_code != c)
- fprintf(stderr, "\tBASE %d/%s\n", ch.base_code, code_str(ch.base_code));
- if (const VirtualChar *vc = ch.virtual_char) {
- fprintf(stderr, "\t*");
- for (const Setting *s = vc->setting.begin(); s != vc->setting.end(); s++)
- switch (s->op) {
- case Setting::FONT:
- fprintf(stderr, " {F%d}", s->x);
- break;
- case Setting::SHOW:
- fprintf(stderr, " %d/%s", s->x, code_str(s->x));
- break;
- case Setting::KERN:
- fprintf(stderr, " <>");
- break;
- case Setting::MOVE:
- fprintf(stderr, " <%+d,%+d>", s->x, s->y);
- break;
- case Setting::RULE:
- fprintf(stderr, " [%d,%d]", s->x, s->y);
- break;
- case Setting::PUSH:
- fprintf(stderr, " (");
- break;
- case Setting::POP:
- fprintf(stderr, " )");
- break;
- case Setting::SPECIAL:
- fprintf(stderr, " S{%s}", s->s.c_str());
- break;
- }
- fprintf(stderr, " ((%d/%s, %d/%s))\n", ch.built_in1, code_str(ch.built_in1), ch.built_in2, code_str(ch.built_in2));
+ Code c;
+ if (ch >= _encoding.begin() && ch < _encoding.end())
+ c = ch - _encoding.begin();
+ else
+ c = -1;
+ fprintf(stderr, "%4d/%s%s%s%s%s%s\n", c, code_str(c),
+ (ch->flag(Char::LIVE) ? " [L]" : ""),
+ (ch->flag(Char::BASE_LIVE) ? " [B]" : ""),
+ (ch->flag(Char::CONTEXT_ONLY) ? " [C]" : ""),
+ (ch->flag(Char::BUILT) ? " [!]" : ""),
+ (ch->base_code >= 0 ? " <BC>" : ""));
+ if (ch->base_code >= 0 && ch->base_code != c)
+ fprintf(stderr, "\tBASE %d/%s\n", ch->base_code, code_str(ch->base_code));
+ if (const VirtualChar *vc = ch->virtual_char) {
+ fprintf(stderr, "\t*");
+ int curfont = 0;
+ for (const Setting *s = vc->setting.begin(); s != vc->setting.end(); s++)
+ switch (s->op) {
+ case Setting::FONT:
+ fprintf(stderr, " {F%d}", s->x);
+ curfont = s->x;
+ break;
+ case Setting::SHOW:
+ fprintf(stderr, " %d", s->x);
+ if (curfont == 0)
+ fprintf(stderr, "/%s", code_str(s->x));
+ break;
+ case Setting::KERN:
+ fprintf(stderr, " <>");
+ break;
+ case Setting::MOVE:
+ fprintf(stderr, " <%+d,%+d>", s->x, s->y);
+ break;
+ case Setting::RULE:
+ fprintf(stderr, " [%d,%d]", s->x, s->y);
+ break;
+ case Setting::PUSH:
+ fprintf(stderr, " (");
+ break;
+ case Setting::POP:
+ fprintf(stderr, " )");
+ break;
+ case Setting::SPECIAL:
+ fprintf(stderr, " S{%s}", s->s.c_str());
+ break;
}
- for (const Ligature *l = ch.ligatures.begin(); l != ch.ligatures.end(); l++)
- fprintf(stderr, "\t[%d/%s => %d/%s]%s\n", l->in2, code_str(l->in2), l->out, code_str(l->out), (_encoding[l->out].context_setting(c, l->in2) ? " [C]" : ""));
+ fprintf(stderr, " ((%d/%s, %d/%s))\n", ch->built_in1, code_str(ch->built_in1), ch->built_in2, code_str(ch->built_in2));
+ }
+ for (const Ligature *l = ch->ligatures.begin(); l != ch->ligatures.end(); l++)
+ fprintf(stderr, "\t[%d/%s => %d/%s]%s\n", l->in2, code_str(l->in2), l->out, code_str(l->out), (_encoding[l->out].context_setting(c, l->in2) ? " [C]" : ""));
#if 0
- for (const Kern *k = ch.kerns.begin(); k != ch.kerns.end(); k++)
- fprintf(stderr, "\t{%d/%s %+d}\n", k->in2, code_str(k->in2), k->kern);
+ for (const Kern *k = ch->kerns.begin(); k != ch->kerns.end(); k++)
+ fprintf(stderr, "\t{%d/%s %+d}\n", k->in2, code_str(k->in2), k->kern);
#endif
- }
+}
+
+void
+Metrics::unparse() const
+{
+ for (const Char *ch = _encoding.begin(); ch < _encoding.end(); ch++)
+ if (ch->glyph)
+ unparse(ch);
}
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/metrics.hh b/Build/source/texk/lcdf-typetools/otftotfm/metrics.hh
index de5003b65c8..d502ae94181 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/otftotfm/metrics.hh
@@ -7,7 +7,8 @@ class DvipsEncoding;
class GlyphFilter;
struct Setting {
- enum { NONE, FONT, SHOW, KERN, MOVE, RULE, PUSH, POP, SPECIAL, DEAD };
+ enum { NONE, FONT, SHOW, KERN, KERNX, MOVE, RULE, PUSH, POP,
+ SPECIAL, DEAD };
int op;
int x;
int y;
@@ -39,6 +40,7 @@ class Metrics { public:
void set_coding_scheme(const String &s) { _coding_scheme = s; }
int design_units() const { return _design_units; }
+ int units_per_em() const { return _units_per_em; }
void set_design_units(int du) { _design_units = du; }
int n_mapped_fonts() const { return _mapped_fonts.size();}
@@ -58,14 +60,15 @@ class Metrics { public:
Code unicode_encoding(uint32_t) const;
Code force_encoding(Glyph, int lookup_source = -1);
void encode(Code, uint32_t uni, Glyph);
- void encode_virtual(Code, PermString, uint32_t uni, const Vector<Setting> &);
+ void encode_virtual(Code, PermString, uint32_t uni, const Vector<Setting> &, bool base_char);
void add_altselector_code(Code, int altselector_type);
bool altselectors() const { return _altselectors.size() > 0; }
+ inline bool was_base_glyph(Code) const;
inline Code base_code(Code) const;
inline Glyph base_glyph(Code) const;
- void base_glyphs(Vector<Glyph> &) const;
+ bool base_glyphs(Vector<Glyph> &, int size) const;
void add_ligature(Code in1, Code in2, Code out);
Code pair_code(Code, Code, int lookup_source = -1);
@@ -81,11 +84,14 @@ class Metrics { public:
void apply_alternates(const Vector<Substitution>&, int lookup, const GlyphFilter&, const Vector<PermString>& glyph_names);
int apply(const Vector<Positioning>&);
+ void apply_base_encoding(const String &font_name, const DvipsEncoding &, const Vector<int> &mapping);
+
void cut_encoding(int size);
void shrink_encoding(int size, const DvipsEncoding &, ErrorHandler *);
void make_base(int size);
bool need_virtual(int size) const;
+ bool need_base();
enum SettingMode { SET_NONE = 0, SET_KEEP = 1, SET_INTERMEDIATE = 3 };
bool setting(Code, Vector<Setting> &, SettingMode = SET_NONE) const;
int ligatures(Code in1, Vector<Code> &in2, Vector<Code> &out, Vector<int> &context) const;
@@ -133,7 +139,8 @@ class Metrics { public:
Code built_in1;
Code built_in2;
int lookup_source;
- enum { BUILT = 1, INTERMEDIATE = 2, CONTEXT_ONLY = 4, LIVE = 8, BASE_LIVE = 16 };
+ enum { BUILT = 1, INTERMEDIATE = 2, CONTEXT_ONLY = 4, LIVE = 8,
+ BASE_LIVE = 16, BASE_REP = 32 };
int flags;
Char() : virtual_char(0) { clear(); }
@@ -142,6 +149,7 @@ class Metrics { public:
bool visible() const { return glyph != 0; }
bool visible_base() const { return glyph != 0 && glyph != VIRTUAL_GLYPH; }
bool flag(int f) const { return (flags & f) != 0; }
+ inline bool base_glyph() const;
bool context_setting(Code in1, Code in2) const;
};
@@ -155,6 +163,7 @@ class Metrics { public:
String _coding_scheme;
int _design_units;
+ int _units_per_em;
bool _liveness_marked : 1;
@@ -174,11 +183,13 @@ class Metrics { public:
friend bool operator<(const Ligature3 &, const Ligature3 &);
void all_ligatures(Vector<Ligature3> &) const;
- void mark_liveness(int size, const Vector<Ligature3> &);
+ void mark_liveness(int size, const Vector<Ligature3> * = 0);
void reencode(const Vector<Code> &);
void apply_ligature(const Vector<Code> &, const Substitution *, int lookup);
+ void unparse(const Char *) const;
+
};
@@ -253,4 +264,19 @@ Metrics::code_str(Code code) const
return code_name(code).c_str();
}
+inline bool
+Metrics::Char::base_glyph() const
+{
+ return glyph == VIRTUAL_GLYPH ? flags & BASE_REP : glyph != 0;
+}
+
+inline bool
+Metrics::was_base_glyph(Code code) const
+{
+ if (code < 0 || code >= _encoding.size())
+ return 0;
+ else
+ return _encoding[code].base_glyph();
+}
+
#endif
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1
index feae43f9740..4e203f75994 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/otftotfm.1
+++ b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
@@ -205,10 +205,20 @@ LaTeX. We begin with six fonts: "MinionPro-Regular.otf",
.PP
Our first task is to decide how to encode the fonts. The "encoding scheme"
is used by TeX to decide how to typeset accents and symbols like "$". The
-"LY1" encoding scheme is a good choice for many OpenType fonts; it
-corresponds to the "texnansx.enc" encoding file, so we will supply
+"LY1" encoding scheme has reasonable accent support and is a good choice
+for many OpenType fonts. LY1 corresponds to the "texnansx.enc" encoding
+file, so we will supply
.B otftotfm
with the "\fB\-e\fR texnansx" option.
+.RS
+.LP
+Expert note: Strictly speaking, LY1 corresponds to the "texnansi.enc"
+encoding file. Since the "texnansx.enc" version omits duplicate
+characters, it has more room for font-specific glyphs and is generally a
+better choice; but if you plan to type characters like "ae" directly into
+your editor, rather than using TeX commands like \eae, you should use
+"texnansi.enc".
+.RE
.PP
Next, we decide on a naming scheme for the font metric files. Let's use
the OpenType font names as a base. (There's generally no need to follow
@@ -637,6 +647,41 @@ the output encoding will equal the input encoding (and
.B otftotfm
will not generate an output encoding).
'
+.Sp
+.TP 5
+.BI \-\-base\-encodings= file
+.B Experts only.
+Allow the output font to refer to existing "base" fonts. This can greatly
+reduce the number of base fonts generated by
+.BR otftotfm ". "
+Each line in the
+.I file
+argument contains a TeX font name (as for
+.BR \-\-name )
+and a corresponding literal encoding file (as for
+.BR \-\-literal\-encoding );
+for example:
+.nf
+ WarnoProReg\-\-eka eka
+ WarnoProReg\-\-exp1 exp1
+.fi
+The named fonts must have been created by prior runs of
+.B otftotfm
+on the same input OpenType font, with the same
+.BR \-\-extend
+and
+.BR \-\-slant
+options as the current run. The current output font will refer to glyphs
+from the named base fonts when possible. If the base fonts cover all
+glyphs required by the output font,
+.B otftotfm
+won't generate any new base fonts at all. The
+.I file
+can also refer to dotless-J fonts using the following syntax:
+.nf
+ WarnoProReg\-\-lcdfj \- dotlessj
+.fi
+'
.PD
'
'
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc
index 81218005ed6..caf984eaf33 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc
@@ -1,6 +1,6 @@
/* otftotfm.cc -- driver for translating OpenType fonts to TeX metrics
*
- * Copyright (c) 2003-2006 Eddie Kohler
+ * Copyright (c) 2003-2007 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
@@ -97,16 +97,17 @@ using namespace Efont;
#define MATH_SPACING_OPT 338
#define POSITION_OPT 339
#define WARN_MISSING_OPT 340
-
-#define AUTOMATIC_OPT 341
-#define FONT_NAME_OPT 342
-#define QUIET_OPT 343
-#define GLYPHLIST_OPT 344
-#define VENDOR_OPT 345
-#define TYPEFACE_OPT 346
-#define NOCREATE_OPT 347
-#define VERBOSE_OPT 348
-#define FORCE_OPT 349
+#define BASE_ENCODINGS_OPT 341
+
+#define AUTOMATIC_OPT 342
+#define FONT_NAME_OPT 343
+#define QUIET_OPT 344
+#define GLYPHLIST_OPT 345
+#define VENDOR_OPT 346
+#define TYPEFACE_OPT 347
+#define NOCREATE_OPT 348
+#define VERBOSE_OPT 349
+#define FORCE_OPT 350
#define VIRTUAL_OPT 351
#define PL_OPT 352
@@ -145,6 +146,7 @@ static Clp_Option options[] = {
{ "subs-filter", 0, SUBS_FILTER_OPT, Clp_ArgString, 0 },
{ "encoding", 'e', ENCODING_OPT, Clp_ArgString, 0 },
{ "literal-encoding", 0, LITERAL_ENCODING_OPT, Clp_ArgString, 0 },
+ { "base-encodings", 0, BASE_ENCODINGS_OPT, Clp_ArgString, 0 },
{ "extend", 'E', EXTEND_OPT, Clp_ArgDouble, 0 },
{ "slant", 'S', SLANT_OPT, Clp_ArgDouble, 0 },
{ "letterspacing", 'L', LETTERSPACE_OPT, Clp_ArgInt, 0 },
@@ -220,6 +222,12 @@ hyphen hyphen =: endash ; endash hyphen =: emdash ; \
quoteleft quoteleft =: quotedblleft ; \
quoteright quoteright =: quotedblright ;";
+struct BaseEncoding {
+ String font_name;
+ String secondary;
+ DvipsEncoding encoding;
+};
+
static const char *program_name;
static String::Initializer initializer;
static String current_time;
@@ -237,9 +245,10 @@ static HashMap<Efont::OpenType::Tag, GlyphFilter*> altselector_feature_filters(0
static String font_name;
static String encoding_file;
+static Vector<BaseEncoding *> base_encodings;
static double extend;
static double slant;
-static int letterspace;
+int letterspace;
static double design_size;
static double minimum_kern = 2.0;
static double space_factor = 1.0;
@@ -321,6 +330,7 @@ Encoding options:\n\
--coding-scheme=SCHEME Set the output coding scheme to SCHEME.\n\
--warn-missing Warn about characters not supported by font.\n\
--literal-encoding=FILE Use DVIPS encoding FILE verbatim.\n\
+ --base-encodings=FILE Output can refer to base fonts named in FILE.\n\
\n");
printf("\
Automatic mode options:\n\
@@ -470,13 +480,18 @@ lig_context_str(int ctx)
return (ctx == 0 ? "LIG" : (ctx < 0 ? "/LIG" : "LIG/"));
}
+static double max_printed_real;
+
static void
fprint_real(FILE *f, const char *prefix, double value, double du, const char *suffix = ")\n")
{
- if (du == 1.)
+ if (du == 1.) {
fprintf(f, "%s R %g%s", prefix, value, suffix);
- else
+ max_printed_real = std::max(max_printed_real, fabs(value));
+ } else {
fprintf(f, "%s R %.4f%s", prefix, value * du, suffix);
+ max_printed_real = std::max(max_printed_real, fabs(value * du));
+ }
}
static String
@@ -499,9 +514,24 @@ font_slant(const FontInfo &finfo)
}
static void
-output_pl(const Metrics &metrics, const String &ps_name, int boundary_char,
- const FontInfo &finfo, bool vpl, FILE *f)
+output_pl(Metrics &metrics, const String &ps_name, int boundary_char,
+ const FontInfo &finfo, bool vpl,
+ const String &filename, ErrorHandler *errh)
{
+ // create file
+ if (no_create) {
+ errh->message("would create %s", filename.c_str());
+ return;
+ }
+
+ if (verbose)
+ errh->message("creating %s", filename.c_str());
+ FILE *f = fopen(filename.c_str(), "w");
+ if (!f) {
+ errh->error("%s: %s", filename.c_str(), strerror(errno));
+ return;
+ }
+
// XXX check DESIGNSIZE and DESIGNUNITS for correctness
fprintf(f, "(COMMENT Created by '%s'%s)\n", invocation.c_str(), current_time.c_str());
@@ -518,6 +548,8 @@ output_pl(const Metrics &metrics, const String &ps_name, int boundary_char,
if (design_size <= 0)
design_size = get_design_size(finfo);
+ max_printed_real = 0;
+
fprintf(f, "(DESIGNSIZE R %.1f)\n"
"(DESIGNUNITS R %d.0)\n"
"(COMMENT DESIGNSIZE (1 em) IS IN POINTS)\n"
@@ -531,7 +563,7 @@ output_pl(const Metrics &metrics, const String &ps_name, int boundary_char,
if (slant)
font_xform.shear(slant);
int bounds[4], width;
- double du = (design_units == 1000 ? 1. : design_units / 1000.);
+ double du = (design_units == metrics.units_per_em() ? 1. : design_units / (double) metrics.units_per_em());
double actual_slant = font_slant(finfo);
if (actual_slant)
@@ -563,14 +595,43 @@ output_pl(const Metrics &metrics, const String &ps_name, int boundary_char,
if (boundary_char >= 0)
fprintf(f, "(BOUNDARYCHAR D %d)\n", boundary_char);
- // write MAPFONT
- if (vpl)
- for (int i = 0; i < metrics.n_mapped_fonts(); i++) {
- String name = metrics.mapped_font_name(i);
+ // figure out font mapping
+ int mapped_font0 = 0;
+ Vector<int> font_mapping;
+ if (vpl) {
+ int vpl_first_font = (metrics.need_base() ? 0 : 1);
+ font_mapping.assign(metrics.n_mapped_fonts(), 0);
+ // how many times is each font used?
+ Vector<Setting> settings;
+ for (int i = 0; i < 256; i++)
+ if (metrics.setting(i, settings)) {
+ int font_number = 0;
+ for (const Setting *s = settings.begin(); s < settings.end(); s++)
+ if (s->op == Setting::SHOW)
+ font_mapping[font_number]++;
+ else if (s->op == Setting::FONT)
+ font_number = (int) s->x;
+ }
+ // make sure the most-used font is number 0
+ mapped_font0 = std::max_element(font_mapping.begin(), font_mapping.end()) - font_mapping.begin();
+ // prepare the mapping
+ for (int i = vpl_first_font; i < font_mapping.size(); i++)
+ font_mapping[i] = i - vpl_first_font;
+ font_mapping[mapped_font0] = 0;
+ font_mapping[vpl_first_font] = mapped_font0 - vpl_first_font;
+ if (vpl_first_font != 0)
+ font_mapping[0] = font_mapping.size() - 1;
+ // write MAPFONT
+ for (int i = 0; i < metrics.n_mapped_fonts() - vpl_first_font; i++) {
+ int j = std::find(font_mapping.begin(), font_mapping.end(), i) - font_mapping.begin();
+ String name = metrics.mapped_font_name(j);
if (!name)
name = make_base_font_name(font_name);
fprintf(f, "(MAPFONT D %d\n (FONTNAME %s)\n (FONTDSIZE R %.1f)\n )\n", i, name.c_str(), design_size);
}
+ } else
+ for (int i = 0; i < metrics.n_mapped_fonts(); i++)
+ font_mapping.push_back(i);
// figure out the proper names and numbers for glyphs
Vector<String> glyph_ids;
@@ -661,6 +722,7 @@ output_pl(const Metrics &metrics, const String &ps_name, int boundary_char,
sa.clear();
push_stack.clear();
CharstringBounds boundser(font_xform);
+ int program_number = mapped_font0;
const CharstringProgram *program = finfo.program();
for (const Setting *s = settings.begin(); s < settings.end(); s++)
switch (s->op) {
@@ -670,20 +732,24 @@ output_pl(const Metrics &metrics, const String &ps_name, int boundary_char,
boundser.char_bounds(program->glyph_context(s->y));
// 3.Aug.2004 -- reported by Marco Kuhlmann: Don't use
// glyph_ids[] array when looking at a different font.
- if (program == finfo.program())
+ if (program_number == 0)
sa << " (SETCHAR " << glyph_ids[s->x] << ')' << glyph_base_comments[s->x] << "\n";
else
sa << " (SETCHAR D " << s->x << ")\n";
break;
- case Setting::MOVE:
- if (vpl)
- boundser.translate(s->x, s->y);
- if (s->x)
- sa << " (MOVERIGHT R " << real_string(s->x, du) << ")\n";
- if (s->y)
- sa << " (MOVEUP R " << real_string(s->y, du) << ")\n";
- break;
+ case Setting::MOVE: {
+ int x = 0, y = 0;
+ while (s+1 < settings.end() && s[1].op == Setting::MOVE)
+ x += s->x, y += s->y, s++;
+ if (vpl)
+ boundser.translate(s->x + x, s->y + y);
+ if (s->x + x)
+ sa << " (MOVERIGHT R " << real_string(s->x + x, du) << ")\n";
+ if (s->y + y)
+ sa << " (MOVEUP R " << real_string(s->y + y, du) << ")\n";
+ break;
+ }
case Setting::RULE:
if (vpl) {
@@ -695,8 +761,11 @@ output_pl(const Metrics &metrics, const String &ps_name, int boundary_char,
break;
case Setting::FONT:
- program = metrics.mapped_font((int) s->x);
- sa << " (SELECTFONT D " << (int) s->x << ")\n";
+ if ((int) s->x != program_number) {
+ program = metrics.mapped_font((int) s->x);
+ program_number = (int) s->x;
+ sa << " (SELECTFONT D " << font_mapping[program_number] << ")\n";
+ }
break;
case Setting::PUSH:
@@ -749,22 +818,18 @@ output_pl(const Metrics &metrics, const String &ps_name, int boundary_char,
fprintf(f, " (MAP\n%s )\n", sa.c_str());
fprintf(f, " )\n");
}
-}
-static void
-output_pl(const Metrics &metrics, const String &ps_name, int boundary_char,
- const FontInfo &finfo, bool vpl, String filename, ErrorHandler *errh)
-{
- if (no_create)
- errh->message("would create %s", filename.c_str());
- else {
+ // at last, close the file
+ fclose(f);
+
+ // Did we print a number too big for TeX to handle? If so, try again.
+ if (max_printed_real >= 2047) {
+ if (metrics.design_units() <= 1)
+ errh->fatal("This font appears to be broken. It has characters so big that the PL format\ncannot represent them.");
+ metrics.set_design_units(metrics.design_units() > 200 ? metrics.design_units() - 250 : 1);
if (verbose)
- errh->message("creating %s", filename.c_str());
- if (FILE *f = fopen(filename.c_str(), "w")) {
- output_pl(metrics, ps_name, boundary_char, finfo, vpl, f);
- fclose(f);
- } else
- errh->error("%s: %s", filename.c_str(), strerror(errno));
+ errh->message("the font's metrics overflow the limits of PL files\n(reducing DESIGNUNITS to %d and trying again)", metrics.design_units());
+ output_pl(metrics, ps_name, boundary_char, finfo, vpl, filename, errh);
}
}
@@ -911,7 +976,7 @@ write_encoding_file(String &filename, const String &encoding_name,
return 0;
}
-static void
+static bool
output_encoding(const Metrics &metrics,
const Vector<PermString> &glyph_names,
ErrorHandler *errh)
@@ -920,7 +985,9 @@ output_encoding(const Metrics &metrics,
// collect encoding data
Vector<Metrics::Glyph> glyphs;
- metrics.base_glyphs(glyphs);
+ if (!metrics.base_glyphs(glyphs, 256))
+ return false;
+
StringAccum sa;
for (int i = 0; i < 256; i++) {
if ((i & 0xF) == 0)
@@ -952,7 +1019,7 @@ output_encoding(const Metrics &metrics,
// exit if we're not responsible for generating an encoding
if (!(output_flags & G_ENCODING))
- return;
+ return true;
// put encoding block in a StringAccum
// 3.Jun.2003: stick command line definition at the end of the encoding,
@@ -997,29 +1064,26 @@ output_encoding(const Metrics &metrics,
fwrite(contents.data(), 1, contents.length(), stdout);
else if (write_encoding_file(out_encoding_file, out_encoding_name, contents, errh) == 1)
update_odir(O_ENCODING, out_encoding_file, errh);
+ return true;
}
static void
-output_tfm(const Metrics &metrics, const String &ps_name, int boundary_char,
+output_tfm(Metrics &metrics, const String &ps_name, int boundary_char,
const FontInfo &finfo, String tfm_filename, String vf_filename,
ErrorHandler *errh)
{
String pl_filename;
- int pl_fd = temporary_file(pl_filename, errh);
- if (pl_fd < 0)
- return;
-
bool vpl = vf_filename;
if (no_create) {
errh->message("would write %s to temporary file", (vpl ? "VPL" : "PL"));
pl_filename = "<temporary>";
} else {
- if (verbose)
- errh->message("writing %s to temporary file", (vpl ? "VPL" : "PL"));
- FILE *f = fdopen(pl_fd, "w");
- output_pl(metrics, ps_name, boundary_char, finfo, vpl, f);
- fclose(f);
+ int pl_fd = temporary_file(pl_filename, errh);
+ if (pl_fd < 0)
+ return;
+ output_pl(metrics, ps_name, boundary_char, finfo, vpl, pl_filename, errh);
+ close(pl_fd);
}
StringAccum command;
@@ -1085,9 +1149,13 @@ output_metrics(Metrics &metrics, const String &ps_name, int boundary_char,
output_pl(metrics, ps_name, boundary_char, finfo, true, outfile, errh);
update_odir(O_VPL, outfile, errh);
}
- metrics.make_base(257);
}
+ // quit if no base needed
+ metrics.make_base(257);
+ if (!metrics.need_base())
+ return;
+
// output metrics
double save_minimum_kern = minimum_kern;
if (need_virtual)
@@ -1301,22 +1369,19 @@ do_math_spacing(Metrics &metrics, const FontInfo &finfo,
int bounds[4], width;
- for (int code = 0; code < 256; code++) {
- int g = metrics.glyph(code);
- if (g != 0 && g != Metrics::VIRTUAL_GLYPH && code != boundary_char) {
- if (char_bounds(bounds, width, finfo, font_xform, code)) {
- int left_sb = (bounds[0] < 0 ? -bounds[0] : 0);
- metrics.add_single_positioning(code, left_sb, 0, left_sb);
-
- if (skew_char >= 0) {
- double virtual_height = (bounds[3] > x_height ? bounds[3] :x_height) - 0.5 * x_height;
- int right_sb = (bounds[2] > width ? bounds[2] - width : 0);
- int skew = (int)(slant * virtual_height + left_sb - right_sb);
- metrics.add_kern(code, skew_char, skew);
- }
+ for (int code = 0; code < metrics.encoding_size(); code++)
+ if (metrics.was_base_glyph(code) && code != boundary_char
+ && char_bounds(bounds, width, finfo, font_xform, code)) {
+ int left_sb = (bounds[0] < 0 ? -bounds[0] : 0);
+ metrics.add_single_positioning(code, left_sb, 0, left_sb);
+
+ if (skew_char >= 0 && code < 256) {
+ double virtual_height = (bounds[3] > x_height ? bounds[3] :x_height) - 0.5 * x_height;
+ int right_sb = (bounds[2] > width ? bounds[2] - width : 0);
+ int skew = (int)(slant * virtual_height + left_sb - right_sb);
+ metrics.add_kern(code, skew_char, skew);
}
}
- }
}
static void
@@ -1395,22 +1460,29 @@ do_file(const String &otf_filename, const OpenType::Font &otf,
dvipsenc.apply_ligkern_kern(metrics, errh);
dvipsenc.apply_position(metrics, errh);
+ // use prespecified raw fonts
+ for (BaseEncoding **be = base_encodings.begin(); be != base_encodings.end(); be++)
+ if (!(*be)->secondary) {
+ Vector<int> mapp;
+ (*be)->encoding.make_base_mappings(mapp, finfo);
+ metrics.apply_base_encoding((*be)->font_name, (*be)->encoding, mapp);
+ }
+
// remove extra characters
metrics.cut_encoding(257);
//metrics.unparse();
int boundary_char = dvipsenc.boundary_char();
// apply letterspacing, if any
- if (letterspace) {
- for (int code = 0; code < 256; code++) {
- int g = metrics.glyph(code);
- if (g != 0 && g != Metrics::VIRTUAL_GLYPH && code != boundary_char) {
+ if (letterspace)
+ for (int code = 0; code < metrics.encoding_size(); code++)
+ if (metrics.was_base_glyph(code) && code != boundary_char) {
metrics.add_single_positioning(code, letterspace / 2, 0, letterspace);
- metrics.add_kern(code, 256, -letterspace / 2);
- metrics.add_kern(256, code, -letterspace / 2);
+ if (code < 256) {
+ metrics.add_kern(code, 256, -letterspace / 2);
+ metrics.add_kern(256, code, -letterspace / 2);
+ }
}
- }
- }
// apply math letterspacing, if any
if (math_spacing)
@@ -1476,6 +1548,16 @@ do_file(const String &otf_filename, const OpenType::Font &otf,
}
+String
+installed_metrics_font_name(const String &base_font_name, const String &secondary)
+{
+ for (BaseEncoding **be = base_encodings.begin(); be != base_encodings.end(); be++)
+ if ((*be)->secondary == secondary && ::font_name == base_font_name)
+ return (*be)->font_name;
+ return String();
+}
+
+
extern "C" {
static int
clp_parse_char(Clp_Parser *clp, const char *arg, int complain, void *)
@@ -1495,6 +1577,63 @@ clp_parse_char(Clp_Parser *clp, const char *arg, int complain, void *)
}
}
+static void
+parse_base_encodings(const String &filename, ErrorHandler *errh)
+{
+ String str = read_file(filename, errh, true);
+ String print_filename = (filename == "-" ? "<stdin>" : filename) + ":";
+ int lineno = 1;
+ str.c_str();
+ const char *s_end = str.end();
+ for (const char *s = str.begin(); s != s_end; ) {
+ while (s != s_end && isspace(*s) && *s != '\n' && *s != '\r')
+ s++;
+ // skip comments and blank lines
+ if (s != s_end && *s != '%' && *s != '#' && *s != '\n' && *s != '\r') {
+ const char *w1 = s;
+ while (s != s_end && !isspace(*s))
+ s++;
+ BaseEncoding *be = new BaseEncoding;
+ be->font_name = str.substring(w1, s);
+ while (s != s_end && isspace(*s) && *s != '\n' && *s != '\r')
+ s++;
+ const char *w2 = s;
+ while (s != s_end && !isspace(*s))
+ s++;
+ String efile = str.substring(w2, s);
+ while (s != s_end && isspace(*s) && *s != '\n' && *s != '\r')
+ s++;
+ if (s != s_end && !isspace(*s) && *s != '%' && *s != '#') {
+ const char *w3 = s;
+ while (s != s_end && !isspace(*s))
+ s++;
+ be->secondary = str.substring(w3, s);
+ }
+ LandmarkErrorHandler lerrh(errh, print_filename + String(lineno));
+ int before = lerrh.nerrors();
+ if (be->secondary)
+ /* encoding ignored */;
+ else if (!efile)
+ lerrh.error("missing encoding name");
+ else if (String path = locate_encoding(efile, errh))
+ be->encoding.parse(path, true, true, &lerrh);
+ else
+ lerrh.error("encoding '%s' not found", efile.c_str());
+ if (lerrh.nerrors() == before)
+ base_encodings.push_back(be);
+ else
+ delete be;
+ }
+ while (s != s_end && *s != '\n' && *s != '\r')
+ s++;
+ if (s != s_end && *s == '\r')
+ s++;
+ if (s != s_end && *s == '\n')
+ s++;
+ lineno++;
+ }
+}
+
int
main(int argc, char *argv[])
{
@@ -1526,6 +1665,7 @@ main(int argc, char *argv[])
Vector<String> ligkern;
Vector<String> pos;
Vector<String> unicoding;
+ Vector<String> base_encoding_files;
bool no_ecommand = false, default_ligkern = true;
int warn_missing = -1;
String codingscheme;
@@ -1615,6 +1755,10 @@ main(int argc, char *argv[])
literal_encoding = true;
break;
+ case BASE_ENCODINGS_OPT:
+ base_encoding_files.push_back(clp->arg);
+ break;
+
case EXTEND_OPT:
if (extend)
usage_error(errh, "extend value specified twice");
@@ -1846,7 +1990,7 @@ main(int argc, char *argv[])
case VERSION_OPT:
printf("otftotfm (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2002-2006 Eddie Kohler\n\
+ printf("Copyright (C) 2002-2007 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");
@@ -1948,6 +2092,10 @@ particular purpose.\n");
if (String s = read_file(*g, errh, true))
DvipsEncoding::add_glyphlist(s);
+ // read base encodings
+ for (String *s = base_encoding_files.begin(); s < base_encoding_files.end(); s++)
+ parse_base_encodings(*s, errh);
+
// read encoding
DvipsEncoding dvipsenc;
if (encoding_file) {
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/otftotfm.hh b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.hh
index 48e4fc9b840..67c0e0b32ab 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/otftotfm.hh
+++ b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.hh
@@ -8,6 +8,8 @@ class ErrorHandler;
String suffix_font_name(const String &font_name, const String &suffix);
+String installed_metrics_font_name(const String &font_name, const String &secondary);
+
void output_metrics(Metrics &metrics, const String &ps_name, int boundary_char,
const FontInfo &finfo,
const String &encoding_name, const String &encoding_file,
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/secondary.cc b/Build/source/texk/lcdf-typetools/otftotfm/secondary.cc
index fc9befe8981..5da704fbf2e 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/secondary.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/secondary.cc
@@ -65,6 +65,7 @@ enum { U_EXCLAMDOWN = 0x00A1, // U+00A1 INVERTED EXCLAMATION MARK
U_INTERROBANGDOWN = 0xD80B, // invalid Unicode
U_TWELVEUDASH = 0xD80C, // invalid Unicode
U_RINGFITTED = 0xD80D, // invalid Unicode
+ U_USE_KERNX = 0xD80E, // invalid Unicode, not in maps
U_VS1 = 0xFE00,
U_VS16 = 0xFE0F,
U_VS17 = 0xE0100,
@@ -218,8 +219,8 @@ bool
Secondary::encode_uni(int code, PermString name, uint32_t uni, Metrics &metrics, ErrorHandler *errh)
{
Vector<Setting> v;
- if (setting(uni, v, metrics, errh)) {
- metrics.encode_virtual(code, name, uni, v);
+ if (int s = setting(uni, v, metrics, errh)) {
+ metrics.encode_virtual(code, name, uni, v, s > 1);
return true;
} else if (_next)
return _next->encode_uni(code, name, uni, metrics, errh);
@@ -237,7 +238,7 @@ T1Secondary::T1Secondary(const FontInfo &finfo, const String &font_name,
_spacewidth = width;
}
-bool
+int
Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHandler *errh)
{
if (_next)
@@ -254,6 +255,13 @@ T1Secondary::char_setting(Vector<Setting> &v, Metrics &metrics, int uni, ...)
// collect codes
va_list val;
va_start(val, uni);
+
+ int kerntype = Setting::KERN;
+ if (uni == U_USE_KERNX) {
+ kerntype = Setting::KERNX;
+ uni = va_arg(val, int);
+ }
+
for (; uni; uni = va_arg(val, int)) {
int code = metrics.unicode_encoding(uni);
if (code < 0) {
@@ -268,7 +276,7 @@ T1Secondary::char_setting(Vector<Setting> &v, Metrics &metrics, int uni, ...)
// generate setting
for (int i = 0; i < codes.size(); i++) {
if (i)
- v.push_back(Setting(Setting::KERN));
+ v.push_back(Setting(kerntype));
v.push_back(Setting(Setting::SHOW, codes[i], metrics.base_glyph(codes[i])));
}
return true;
@@ -281,7 +289,7 @@ T1Secondary::encode_uni(int code, PermString name, uint32_t uni, Metrics &metric
Vector<Setting> v;
setting(uni, v, metrics, errh);
int which = (uni == U_ALTSELECTOR ? 0 : (uni <= U_VS16 ? uni - U_VS1 + 1 : uni - U_VS17 + 17));
- metrics.encode_virtual(code, (which ? permprintf("<vs%d>", which) : PermString("<altselector>")), uni, v);
+ metrics.encode_virtual(code, (which ? permprintf("<vs%d>", which) : PermString("<altselector>")), uni, v, false);
metrics.add_altselector_code(code, which);
return true;
} else
@@ -302,8 +310,18 @@ T1Secondary::dotlessj_font(Metrics &metrics, ErrorHandler *errh, Glyph &dj_glyph
{
if (!_font_name || !_finfo.otf || !_finfo.cff)
return -1;
-
- String dj_name = suffix_font_name(_font_name, "--lcdfj");
+
+ String dj_name;
+ bool install_metrics;
+ // XXX make sure dotlessj is for the main font?
+ if ((dj_name = installed_metrics_font_name(_font_name, "dotlessj")))
+ install_metrics = false;
+ else {
+ dj_name = suffix_font_name(_font_name, "--lcdfj");
+ install_metrics = true;
+ }
+
+ // is dotlessj already mapped?
for (int i = 0; i < metrics.n_mapped_fonts(); i++)
if (metrics.mapped_font_name(i) == dj_name)
return i;
@@ -339,21 +357,25 @@ T1Secondary::dotlessj_font(Metrics &metrics, ErrorHandler *errh, Glyph &dj_glyph
return -1;
}
- // create metrics for dotless-J
- Metrics dj_metrics(font, 256);
+ // find dotless-J character
Vector<PermString> glyph_names;
font->glyph_names(glyph_names);
Vector<PermString>::iterator g = std::find(glyph_names.begin(), glyph_names.end(), "uni0237");
- if (g != glyph_names.end()) {
- dj_glyph = g - glyph_names.begin();
- dj_metrics.encode('j', U_DOTLESSJ, dj_glyph);
- } else {
+ if (g == glyph_names.end()) {
errh->error("%s: dotless-J font has no 'uni0237' glyph", filename.c_str());
delete font;
return -1;
}
- ::dotlessj_file_name = filename;
- output_metrics(dj_metrics, font->font_name(), -1, _finfo, String(), String(), dj_name, dotlessj_dvips_include, errh);
+ dj_glyph = g - glyph_names.begin();
+
+ // create metrics for dotless-J
+ if (install_metrics) {
+ Metrics dj_metrics(font, 256);
+ dj_metrics.encode('j', U_DOTLESSJ, dj_glyph);
+ ::dotlessj_file_name = filename;
+ output_metrics(dj_metrics, font->font_name(), -1, _finfo, String(), String(), dj_name, dotlessj_dvips_include, errh);
+ } else if (verbose)
+ errh->message("using '%s' for dotless-J font metrics", dj_name.c_str());
// add font to metrics
return metrics.add_mapped_font(font, dj_name);
@@ -362,26 +384,27 @@ T1Secondary::dotlessj_font(Metrics &metrics, ErrorHandler *errh, Glyph &dj_glyph
return -1;
}
-bool
+int
T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHandler *errh)
{
Transform xform;
int vsize = v.size();
+ extern int letterspace;
switch (uni) {
case U_CWM:
case U_ALTSELECTOR:
v.push_back(Setting(Setting::RULE, 0, _xheight));
- return true;
+ return 1;
case U_CAPITALCWM:
v.push_back(Setting(Setting::RULE, 0, font_cap_height(_finfo, xform)));
- return true;
+ return 1;
case U_ASCENDERCWM:
v.push_back(Setting(Setting::RULE, 0, font_ascender(_finfo, xform)));
- return true;
+ return 1;
case U_VISIBLESPACE:
v.push_back(Setting(Setting::MOVE, 50, -150));
@@ -389,63 +412,63 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
v.push_back(Setting(Setting::RULE, _spacewidth, 40));
v.push_back(Setting(Setting::RULE, 40, 150));
v.push_back(Setting(Setting::MOVE, 50, 150));
- return true;
+ return 2;
case U_SS:
if (char_setting(v, metrics, 'S', 'S', 0))
- return true;
+ return 1;
break;
case U_SSSMALL:
if (char_setting(v, metrics, U_SSMALL, U_SSMALL, 0))
- return true;
+ return 1;
else if (char_setting(v, metrics, 's', 's', 0))
- return true;
+ return 1;
break;
case U_FFSMALL:
if (char_setting(v, metrics, U_FSMALL, U_FSMALL, 0))
- return true;
+ return 1;
else if (char_setting(v, metrics, 'f', 'f', 0))
- return true;
+ return 1;
break;
case U_FISMALL:
if (char_setting(v, metrics, U_FSMALL, U_ISMALL, 0))
- return true;
+ return 1;
else if (char_setting(v, metrics, 'f', 'i', 0))
- return true;
+ return 1;
break;
case U_FLSMALL:
if (char_setting(v, metrics, U_FSMALL, U_LSMALL, 0))
- return true;
+ return 1;
else if (char_setting(v, metrics, 'f', 'l', 0))
- return true;
+ return 1;
break;
case U_FFISMALL:
if (char_setting(v, metrics, U_FSMALL, U_FSMALL, U_ISMALL, 0))
- return true;
+ return 1;
else if (char_setting(v, metrics, 'f', 'f', 'i', 0))
- return true;
+ return 1;
break;
case U_FFLSMALL:
if (char_setting(v, metrics, U_FSMALL, U_FSMALL, U_LSMALL, 0))
- return true;
+ return 1;
else if (char_setting(v, metrics, 'f', 'f', 'l', 0))
- return true;
+ return 1;
break;
case U_IJ:
if (char_setting(v, metrics, 'I', 'J', 0))
- return true;
+ return 1;
break;
case U_ij:
if (char_setting(v, metrics, 'i', 'j', 0))
- return true;
+ return 1;
break;
case U_DOTLESSJ:
@@ -456,9 +479,9 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (which >= 0) {
v.push_back(Setting(Setting::FONT, which));
v.push_back(Setting(Setting::SHOW, 'j', dj_glyph));
- return true;
+ return 2;
} else if (which == J_NODOT && char_setting(v, metrics, 'j', 0))
- return true;
+ return 1;
break;
}
@@ -466,10 +489,10 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_setting(v, metrics, '[', 0)) {
if (!_finfo.is_fixed_pitch()) {
double d = char_one_bound(_finfo, xform, 4, true, 0, '[', 0);
- v.push_back(Setting(Setting::MOVE, (int) (-0.666 * d), 0));
+ v.push_back(Setting(Setting::MOVE, (int) (-0.666 * d - letterspace), 0));
}
char_setting(v, metrics, '[', 0);
- return true;
+ return 1;
}
break;
@@ -477,10 +500,10 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_setting(v, metrics, ']', 0)) {
if (!_finfo.is_fixed_pitch()) {
double d = char_one_bound(_finfo, xform, 4, true, 0, ']', 0);
- v.push_back(Setting(Setting::MOVE, (int) (-0.666 * d), 0));
+ v.push_back(Setting(Setting::MOVE, (int) (-0.666 * d - letterspace), 0));
}
char_setting(v, metrics, ']', 0);
- return true;
+ return 1;
}
break;
@@ -488,10 +511,10 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_setting(v, metrics, '|', 0)) {
if (!_finfo.is_fixed_pitch()) {
double d = char_one_bound(_finfo, Transform(), 4, true, 0, '|', 0);
- v.push_back(Setting(Setting::MOVE, (int) (-0.333 * d), 0));
+ v.push_back(Setting(Setting::MOVE, (int) (-0.333 * d - letterspace), 0));
}
char_setting(v, metrics, '|', 0);
- return true;
+ return 1;
}
break;
@@ -503,8 +526,10 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_bounds(bounds, bounds[4], _finfo, xform, '('))
dropdown -= std::max(bounds[3], 0) + std::min(bounds[1], 0);
v.push_back(Setting(Setting::MOVE, 0, (int) (-dropdown / 2)));
- if (char_setting(v, metrics, '*', 0))
- return true;
+ if (char_setting(v, metrics, '*', 0)) {
+ v.push_back(Setting(Setting::MOVE, 0, -(int) (-dropdown / 2)));
+ return 1;
+ }
break;
}
@@ -512,10 +537,10 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_setting(v, metrics, U_ENDASH, 0)) {
if (!_finfo.is_fixed_pitch()) {
double d = char_one_bound(_finfo, xform, 4, true, 0, U_ENDASH, 0);
- v.push_back(Setting(Setting::MOVE, (int) (667 - 2 * d), 0));
+ v.push_back(Setting(Setting::MOVE, (int) (667 - 2 * d - letterspace), 0));
}
char_setting(v, metrics, U_ENDASH, 0);
- return true;
+ return 1;
}
break;
@@ -523,17 +548,17 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_setting(v, metrics, U_ENDASH, 0)) {
if (!_finfo.is_fixed_pitch()) {
double d = char_one_bound(_finfo, xform, 4, true, 0, U_ENDASH, 0);
- v.push_back(Setting(Setting::MOVE, (int) (750 - 2 * d), 0));
+ v.push_back(Setting(Setting::MOVE, (int) (750 - 2 * d - letterspace), 0));
}
char_setting(v, metrics, U_ENDASH, 0);
- return true;
+ return 1;
}
break;
case U_CENTIGRADE:
// TODO: set italic correction to that of a 'C'
- if (char_setting(v, metrics, U_DEGREE, 'C', 0))
- return true;
+ if (char_setting(v, metrics, U_USE_KERNX, U_DEGREE, 'C', 0))
+ return 1;
break;
case U_INTERROBANG: {
@@ -545,7 +570,7 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_setting(v, metrics, '!', 0)) {
v.push_back(Setting(Setting::POP));
if (char_setting(v, metrics, '?', 0))
- return true;
+ return 1;
}
break;
}
@@ -559,14 +584,14 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_setting(v, metrics, U_EXCLAMDOWN, 0)) {
v.push_back(Setting(Setting::POP));
if (char_setting(v, metrics, U_QUESTIONDOWN, 0))
- return true;
+ return 1;
}
break;
}
case U_PERTENTHOUSAND:
- if (char_setting(v, metrics, 0xF661, U_FRACTION, 0xF655, 0xF655, 0xF655, 0))
- return true;
+ if (char_setting(v, metrics, U_USE_KERNX, 0xF661, U_FRACTION, 0xF655, 0xF655, 0xF655, 0))
+ return 1;
break;
case U_RINGFITTED: {
@@ -582,7 +607,7 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
v.push_back(Setting(Setting::MOVE, offset, 0));
if (char_setting(v, metrics, ring_char, 0)) {
v.push_back(Setting(Setting::MOVE, A_width - ring_width - offset, 0));
- return true;
+ return 1;
}
}
break;
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/secondary.hh b/Build/source/texk/lcdf-typetools/otftotfm/secondary.hh
index a4abd36f352..810aaacea6d 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/secondary.hh
+++ b/Build/source/texk/lcdf-typetools/otftotfm/secondary.hh
@@ -50,7 +50,7 @@ class Secondary { public:
void set_next(Secondary *s) { _next = s; }
typedef Efont::OpenType::Glyph Glyph;
virtual bool encode_uni(int code, PermString name, uint32_t uni, Metrics &, ErrorHandler *);
- virtual bool setting(uint32_t uni, Vector<Setting> &, Metrics &, ErrorHandler *);
+ virtual int setting(uint32_t uni, Vector<Setting> &, Metrics &, ErrorHandler *);
private:
Secondary *_next;
};
@@ -58,7 +58,7 @@ class Secondary { public:
class T1Secondary : public Secondary { public:
T1Secondary(const FontInfo &, const String &font_name, const String &otf_file_name);
bool encode_uni(int code, PermString name, uint32_t uni, Metrics &, ErrorHandler *);
- bool setting(uint32_t uni, Vector<Setting> &, Metrics &, ErrorHandler *);
+ int setting(uint32_t uni, Vector<Setting> &, Metrics &, ErrorHandler *);
private:
const FontInfo &_finfo;
String _font_name;
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/uniprop.cc b/Build/source/texk/lcdf-typetools/otftotfm/uniprop.cc
index b4975d1dfa1..b38b022aa3b 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/uniprop.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/uniprop.cc
@@ -1,6 +1,6 @@
/* uniprop.{cc,hh} -- code for Unicode character properties
*
- * Copyright (c) 2004-2006 Eddie Kohler
+ * Copyright (c) 2004-2007 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
@@ -19,75 +19,87 @@ 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_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, 55, P_Cn, 80, 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, 88, P_Cn, 93, P_Mn, 112, P_Cn, 116, P_Sk, 118, P_Cn, 122, P_Lm, 123, P_Cn, 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, 252, P_Cn,
- 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_Cn, 208, P_Lul, 246, P_Cn, 248, P_Lul, 250, P_Cn,
- 0, P_Lul, 16, 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, 162, P_Cn, 163, P_Mn, 186, P_Cn, 187, P_Mn, 190, P_Po, 191, P_Mn, 192, P_Po, 193, P_Mn, 195, P_Po, 196, P_Mn, 197, P_Cn, 208, P_Lo, 235, P_Cn, 240, P_Lo, 243, P_Po, 245, P_Cn,
- 0, P_Cf, 4, P_Cn, 12, P_Po, 14, P_So, 16, P_Mn, 22, P_Cn, 27, P_Po, 28, P_Cn, 31, P_Po, 32, P_Cn, 33, P_Lo, 59, P_Cn, 64, P_Lm, 65, P_Lo, 75, P_Mn, 89, 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, 80, P_Cn, 128, P_Lo, 166, P_Mn, 177, P_Lo, 178, 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, 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_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_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, 182, P_Cn, 183, 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, 231, 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_Cn, 230, P_Nd, 240, 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_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, 249, P_Cn, 251, P_Po, 252, 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_Lo, 7, P_Cn, 8, P_Lo, 71, P_Cn, 72, 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, 135, P_Cn, 136, P_Lo, 137, P_Cn, 138, P_Lo, 142, P_Cn, 144, P_Lo, 175, P_Cn, 176, 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, 207, P_Cn, 208, P_Lo, 215, P_Cn, 216, P_Lo, 239, P_Cn, 240, P_Lo,
- 0, P_Lo, 15, P_Cn, 16, P_Lo, 17, P_Cn, 18, P_Lo, 22, P_Cn, 24, P_Lo, 31, P_Cn, 32, P_Lo, 71, P_Cn, 72, P_Lo, 91, P_Cn, 97, P_Po, 105, P_Nd, 114, P_No, 125, P_Cn, 160, P_Lo, 245, P_Cn,
+ 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, 224, P_So,
- 0, P_Ll, 44, P_Lm, 98, P_Ll, 108, 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_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, 12, 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_Cn, 87, P_Po, 88, P_Cn, 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, 160, P_Sc, 178, P_Cn, 208, P_Mn, 221, P_Me, 225, P_Mn, 226, P_Me, 229, P_Mn, 235, 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, 50, P_So, 51, P_Lul, 53, P_Lo, 57, P_Ll, 58, P_So, 60, P_Cn, 61, P_Ll, 62, P_Lu, 64, P_Sm, 69, P_Lul, 71, P_Ll, 74, P_So, 75, P_Sm, 76, P_Cn, 83, P_No, 96, P_Nl, 132, 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, 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_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_Ps, 181, P_Pe, 182, P_Po, 183, P_So, 209, P_Cn,
+ 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, 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, 24, P_Cn, 25, P_So, 111, P_Sm, 112, P_So, 126, P_Cn, 128, P_So, 146, P_Cn, 160, P_So, 162, 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, 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, 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,
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, 14, P_Cn,
- 0, P_Cn, 128, P_So, 154, P_Cn, 155, P_So, 244, P_Cn,
+ 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, 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_Pc, 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, 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, 126, P_Cn, 127, 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, 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_Lo, 1, P_Cn,
0, P_Cn, 181, P_Lo, 182, P_Cn, 192, P_So,
- 0, P_Cn, 165, P_Lo, 166, P_Cn,
+ 0, P_Cn, 187, P_Lo, 188, 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_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,
+ 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_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_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, 101, P_Pc, 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_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_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_Cn,
- 0, P_Lo, 31, P_Cn, 32, P_No, 36, P_Cn, 48, P_Lo, 74, P_Nl, 75, P_Cn, 128, P_Lo, 158, P_Cn, 159, P_Po, 160, 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_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_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, 87, 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,
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, 164, 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_Cn, 206, P_Nd,
+ 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_Cn, 214, P_Lo, 215, P_Cn,
0, P_Lo, 30, P_Cn,
0, P_Cn, 1, P_Cf, 2, P_Cn, 32, P_Cf, 128, P_Cn,
@@ -97,119 +109,132 @@ const unsigned char UnicodeProperty::property_pages[] = {
const unsigned int UnicodeProperty::property_offsets[] = {
0x0, 2, 122,
0x100, 122, 248,
- 0x200, 248, 272,
- 0x300, 272, 342,
- 0x400, 342, 374,
- 0x500, 374, 432,
- 0x600, 432, 504,
- 0x700, 504, 532,
+ 0x200, 248, 290,
+ 0x300, 290, 356,
+ 0x400, 356, 382,
+ 0x500, 382, 436,
+ 0x600, 436, 510,
+ 0x700, 510, 554,
0x800, 0, 2,
- 0x900, 532, 650,
- 0xA00, 650, 790,
- 0xB00, 790, 948,
- 0xC00, 948, 1064,
- 0xD00, 1064, 1162,
- 0xE00, 1162, 1270,
- 0xF00, 1270, 1350,
- 0x1000, 1350, 1404,
- 0x1100, 1404, 1416,
- 0x1200, 1416, 1494,
- 0x1300, 1494, 1530,
- 0x1400, 1530, 1534,
- 0x1500, 1534, 1536,
- 0x1600, 1536, 1562,
- 0x1700, 1562, 1636,
- 0x1800, 1636, 1666,
- 0x1900, 1666, 1708,
- 0x1A00, 0, 2,
- 0x1D00, 1708, 1716,
- 0x1E00, 1716, 1726,
- 0x1F00, 1726, 1854,
- 0x2000, 1854, 1968,
- 0x2100, 1968, 2090,
- 0x2200, 2090, 2092,
- 0x2300, 2092, 2124,
- 0x2400, 2124, 2138,
- 0x2500, 2138, 2150,
- 0x2600, 2150, 2170,
- 0x2700, 2170, 2266,
- 0x2800, 2266, 2268,
- 0x2900, 2268, 2332,
- 0x2A00, 2090, 2092,
- 0x2B00, 2332, 2336,
- 0x2C00, 0, 2,
- 0x2E00, 2336, 2346,
- 0x2F00, 2346, 2354,
- 0x3000, 2354, 2456,
- 0x3100, 2456, 2478,
- 0x3200, 2478, 2508,
- 0x3300, 2266, 2268,
- 0x3400, 2508, 2512,
+ 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,
0x3500, 0, 2,
- 0x4D00, 2512, 2520,
- 0x4E00, 2508, 2512,
+ 0x4D00, 2720, 2728,
+ 0x4E00, 2716, 2720,
0x4F00, 0, 2,
- 0x9F00, 2520, 2526,
- 0xA000, 1534, 1536,
- 0xA400, 2526, 2534,
+ 0x9F00, 2728, 2734,
+ 0xA000, 2734, 2740,
+ 0xA100, 1538, 1540,
+ 0xA400, 2740, 2748,
0xA500, 0, 2,
- 0xAC00, 2508, 2512,
+ 0xA700, 2748, 2758,
+ 0xA800, 2758, 2788,
+ 0xA900, 0, 2,
+ 0xAC00, 2716, 2720,
0xAD00, 0, 2,
- 0xD700, 2534, 2540,
- 0xD800, 2540, 2544,
+ 0xD700, 2788, 2794,
+ 0xD800, 2794, 2798,
0xD900, 0, 2,
- 0xDB00, 2544, 2552,
- 0xDC00, 2540, 2544,
+ 0xDB00, 2798, 2806,
+ 0xDC00, 2794, 2798,
0xDD00, 0, 2,
- 0xDF00, 2552, 2556,
- 0xE000, 2556, 2560,
+ 0xDF00, 2806, 2810,
+ 0xE000, 2810, 2814,
0xE100, 0, 2,
- 0xF800, 2560, 2564,
- 0xF900, 1534, 1536,
- 0xFA00, 2564, 2572,
- 0xFB00, 2572, 2614,
- 0xFC00, 1534, 1536,
- 0xFD00, 2614, 2638,
- 0xFE00, 2638, 2742,
- 0xFF00, 2742, 2864,
- 0x10000, 2864, 2892,
- 0x10100, 2892, 2906,
+ 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, 2906, 2928,
- 0x10400, 2928, 2940,
+ 0x10300, 3178, 3214,
+ 0x10400, 3214, 3226,
0x10500, 0, 2,
- 0x10800, 2940, 2964,
- 0x10900, 0, 2,
- 0x1D000, 2964, 2968,
- 0x1D100, 2968, 2998,
- 0x1D200, 0, 2,
- 0x1D300, 2998, 3002,
- 0x1D400, 3002, 3058,
- 0x1D500, 3058, 3112,
- 0x1D600, 3112, 3144,
- 0x1D700, 3144, 3184,
+ 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, 2508, 2512,
+ 0x20000, 2716, 2720,
0x20100, 0, 2,
- 0x2A600, 3184, 3190,
+ 0x2A600, 3544, 3550,
0x2A700, 0, 2,
- 0x2F800, 1534, 1536,
- 0x2FA00, 3190, 3194,
+ 0x2F800, 1538, 1540,
+ 0x2FA00, 3550, 3554,
0x2FB00, 0, 2,
- 0xE0000, 3194, 3204,
- 0xE0100, 3204, 3208,
+ 0xE0000, 3554, 3564,
+ 0xE0100, 3564, 3568,
0xE0200, 0, 2,
- 0xF0000, 2556, 2560,
+ 0xF0000, 2810, 2814,
0xF0100, 0, 2,
- 0xFFF00, 3208, 3214,
- 0x100000, 2556, 2560,
+ 0xFFF00, 3568, 3574,
+ 0x100000, 2810, 2814,
0x100100, 0, 2,
- 0x10FF00, 3208, 3214,
+ 0x10FF00, 3568, 3574,
0x110000, 0, 2,
};
const int UnicodeProperty::nproperty_offsets = (sizeof(UnicodeProperty::property_offsets) / (3*sizeof(unsigned int)));
-inline const unsigned int*
+inline const unsigned int *
UnicodeProperty::find_offset(uint32_t u)
{
// Up to U+1A00 each page has its own definition.
@@ -219,7 +244,7 @@ UnicodeProperty::find_offset(uint32_t u)
int l = 0x1A, r = nproperty_offsets - 2;
while (l <= r) {
int m = (l + r) / 2;
- const unsigned int* ptr = &property_offsets[3*m];
+ const unsigned int *ptr = &property_offsets[3*m];
if (u < ptr[0])
r = m - 1;
else if (u >= ptr[3])
@@ -234,17 +259,17 @@ UnicodeProperty::find_offset(uint32_t u)
int
UnicodeProperty::property(uint32_t u)
{
- const unsigned int* offsets = find_offset(u);
+ const unsigned int *offsets = find_offset(u);
// Now we only care about the last byte.
u &= 255;
// Binary search within record.
int l = offsets[1], r = offsets[2] - 4;
- const unsigned char* the_ptr;
+ const unsigned char *the_ptr;
while (l <= r) {
int m = ((l + r) / 2) & ~1;
- const unsigned char* ptr = &property_pages[m];
+ const unsigned char *ptr = &property_pages[m];
if (u < ptr[0])
r = m - 2;
else if (u >= ptr[2])
@@ -273,7 +298,7 @@ static const char property_names[] =
"Po\0Pc\0Pd\0Ps\0Pe\0Pi\0Pf\0\0\0\0"
"So\0Sm\0Sc\0Sk";
-static const char* const property_long_names[] = {
+static const char * const property_long_names[] = {
"Unassigned", "PrivateUse", "Surrogate", "Format", "Control", 0, 0, 0,
"SpaceSeparator", "LineSeparator", "ParagraphSeparator", 0, 0, 0, 0, 0,
"NonspacingMark", "SpacingMark", "EnclosingMark", 0, 0, 0, 0, 0,
@@ -283,12 +308,12 @@ static const char* const property_long_names[] = {
"OtherSymbol", "MathSymbol", "CurrencySymbol", "ModifierSymbol"
};
-static const char* const property_category_long_names[] = {
+static const char * const property_category_long_names[] = {
"Other", "Separator", "Mark", "Letter", "Number", "Punctuation", "Symbol"
};
-const char*
+const char *
UnicodeProperty::property_name(int p)
{
if (p >= 0 && p <= P_Sk && property_names[p*3])
@@ -298,7 +323,7 @@ UnicodeProperty::property_name(int p)
}
bool
-UnicodeProperty::parse_property(const String& s, int& prop, int& prop_mask)
+UnicodeProperty::parse_property(const String &s, int &prop, int &prop_mask)
{
if (s.length() == 0)
return false;
@@ -320,7 +345,7 @@ UnicodeProperty::parse_property(const String& s, int& prop, int& prop_mask)
}
return false;
} else {
- const char* const *dict = property_category_long_names;
+ const char * const *dict = property_category_long_names;
for (int i = 0; i <= P_S; i += 010, dict++)
if (s == *dict) {
prop = i;
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/uniprop.hh b/Build/source/texk/lcdf-typetools/otftotfm/uniprop.hh
index 8a08f427203..8a08f427203 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/uniprop.hh
+++ b/Build/source/texk/lcdf-typetools/otftotfm/uniprop.hh
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/util.cc b/Build/source/texk/lcdf-typetools/otftotfm/util.cc
index 7628e9063ca..7628e9063ca 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/util.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/util.cc
diff --git a/Build/source/utils/lcdf-typetools/otftotfm/util.hh b/Build/source/texk/lcdf-typetools/otftotfm/util.hh
index a0f37c14105..a0f37c14105 100644
--- a/Build/source/utils/lcdf-typetools/otftotfm/util.hh
+++ b/Build/source/texk/lcdf-typetools/otftotfm/util.hh
diff --git a/Build/source/utils/lcdf-typetools/t1dotlessj/Makefile.am b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.am
index 802f841f664..802f841f664 100644
--- a/Build/source/utils/lcdf-typetools/t1dotlessj/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
index 190e256e6a5..190e256e6a5 100644
--- a/Build/source/utils/lcdf-typetools/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1
index e06e3ed922d..5c458810f67 100644
--- a/Build/source/utils/lcdf-typetools/t1dotlessj/t1dotlessj.1
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1
@@ -1,4 +1,4 @@
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/utils/lcdf-typetools/t1dotlessj/t1dotlessj.cc b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
index 8206414a1fc..78f73cb36b0 100644
--- a/Build/source/utils/lcdf-typetools/t1dotlessj/t1dotlessj.cc
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
@@ -371,7 +371,10 @@ particular purpose.\n");
errh->warning("derived font name '%s' longer than 29 characters", actual_font_name.c_str());
errh->message("(Use the '--name' option to supply your own name.)");
}
- Type1Font *dotless_font = Type1Font::skeleton_make_copy(font, actual_font_name);
+
+ Vector<double> xuid_extension;
+ xuid_extension.push_back(0x00237237);
+ Type1Font *dotless_font = Type1Font::skeleton_make_copy(font, actual_font_name, &xuid_extension);
dotless_font->skeleton_common_subrs();
// copy space and .notdef
diff --git a/Build/source/utils/lcdf-typetools/t1lint/Makefile.am b/Build/source/texk/lcdf-typetools/t1lint/Makefile.am
index 641702c1ed2..641702c1ed2 100644
--- a/Build/source/utils/lcdf-typetools/t1lint/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/t1lint/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
index 39ce4541a67..39ce4541a67 100644
--- a/Build/source/utils/lcdf-typetools/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/t1lint/cscheck.cc b/Build/source/texk/lcdf-typetools/t1lint/cscheck.cc
index 99cac139af5..febf2f48f14 100644
--- a/Build/source/utils/lcdf-typetools/t1lint/cscheck.cc
+++ b/Build/source/texk/lcdf-typetools/t1lint/cscheck.cc
@@ -112,6 +112,7 @@ void
CharstringChecker::rmoveto(double, double)
{
_cp_exists = true;
+ _just_flexed = false;
}
void
@@ -183,6 +184,7 @@ CharstringChecker::callothersubr()
ps_push(_cp.x);
ps_push(_cp.y);
_flex = true;
+ _just_flexed = true;
//_flex_connect = _connect;
break;
@@ -193,8 +195,11 @@ CharstringChecker::callothersubr()
}
if (!_flex)
return error(errFlex, 0);
+ if (_just_flexed)
+ _errh->error("Flex control points must be separated by a moveto");
ps_push(_cp.x);
ps_push(_cp.y);
+ _just_flexed = true;
break;
case 3: // hint replacement
@@ -445,7 +450,7 @@ CharstringChecker::check(const CharstringContext &g, ErrorHandler *errh)
_started = false;
_flex = false;
- _hstem = _hstem3 = _vstem = _vstem3 = false;
+ _hstem = _hstem3 = _vstem = _vstem3 = _just_flexed = false;
_h_hstem.clear();
_h_vstem.clear();
_h_hstem3.clear();
diff --git a/Build/source/utils/lcdf-typetools/t1lint/cscheck.hh b/Build/source/texk/lcdf-typetools/t1lint/cscheck.hh
index e5f509ab232..2004f165ee9 100644
--- a/Build/source/utils/lcdf-typetools/t1lint/cscheck.hh
+++ b/Build/source/texk/lcdf-typetools/t1lint/cscheck.hh
@@ -31,6 +31,8 @@ class CharstringChecker : public Efont::CharstringInterp { public:
bool _vstem;
bool _vstem3;
+ bool _just_flexed;
+
Vector<double> _h_hstem;
Vector<double> _h_vstem;
diff --git a/Build/source/utils/lcdf-typetools/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1
index ffed5e8337b..6d062c5f3a3 100644
--- a/Build/source/utils/lcdf-typetools/t1lint/t1lint.1
+++ b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1
@@ -1,4 +1,4 @@
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/utils/lcdf-typetools/t1lint/t1lint.cc b/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc
index e0f3a7425a9..0ce45b54f7b 100644
--- a/Build/source/utils/lcdf-typetools/t1lint/t1lint.cc
+++ b/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc
@@ -146,7 +146,7 @@ check_blue_array(Vector<double> &blues, const char *name, double BlueScale,
if (blues[i] > blues[i+1])
errh->error("%s zone %d in the wrong order", name, i/2);
else if (blues[i+1] - blues[i] >= max_diff)
- errh->error("%s zone %d too large in relation to BlueScale", name, i/2);
+ errh->error("%s zone %d too large in relation to BlueScale (size %g, max %g [%g])", name, i/2, blues[i+1] - blues[i], max_diff, BlueScale);
}
}
@@ -332,21 +332,21 @@ do_file(const char *filename, PsresDatabase *psres, ErrorHandler *errh)
int UniqueID = -1, UniqueID2 = -1;
if (get_integer(font, Type1Font::dF, "UniqueID", UniqueID, errh)
&& (UniqueID < 0 || UniqueID > 0xFFFFFF))
- errh->error("UniqueID not in the range 0-16777215");
+ cerrh.error("UniqueID not in the range 0-16777215");
if (get_integer(font, Type1Font::dP, "UniqueID", UniqueID2, errh)
&& (UniqueID2 < 0 || UniqueID2 > 0xFFFFFF))
- errh->error("Private UniqueID not in the range 0-16777215");
+ cerrh.error("Private UniqueID not in the range 0-16777215");
if (UniqueID >= 0 && UniqueID2 >= 0 && UniqueID != UniqueID2)
- errh->error("Private UniqueID does not equal font UniqueID");
+ cerrh.error("Private UniqueID does not equal font UniqueID");
// check XUID values
Vector<double> XUID;
if (get_num_array(font, Type1Font::dF, "XUID", XUID, errh)) {
if (XUID.size() == 0)
- errh->error("empty XUID");
+ cerrh.error("empty XUID");
for (int i = 0; i < XUID.size(); i++) {
if (floor(XUID[i]) != XUID[i] || XUID[i] < 0 || XUID[i] > 0xFFFFFF) {
- errh->error("element of XUID not an integer in the range 0-16777215");
+ cerrh.error("element of XUID not an integer in the range 0-16777215");
break;
}
}
diff --git a/Build/source/utils/lcdf-typetools/t1reencode/Makefile.am b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.am
index 8dcf9da887d..8dcf9da887d 100644
--- a/Build/source/utils/lcdf-typetools/t1reencode/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
index e75edbfa5e5..e75edbfa5e5 100644
--- a/Build/source/utils/lcdf-typetools/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/t1reencode/md5.c b/Build/source/texk/lcdf-typetools/t1reencode/md5.c
index d9fbd7510e2..d9fbd7510e2 100644
--- a/Build/source/utils/lcdf-typetools/t1reencode/md5.c
+++ b/Build/source/texk/lcdf-typetools/t1reencode/md5.c
diff --git a/Build/source/utils/lcdf-typetools/t1reencode/md5.h b/Build/source/texk/lcdf-typetools/t1reencode/md5.h
index 228c45f615c..228c45f615c 100644
--- a/Build/source/utils/lcdf-typetools/t1reencode/md5.h
+++ b/Build/source/texk/lcdf-typetools/t1reencode/md5.h
diff --git a/Build/source/utils/lcdf-typetools/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
index 170eddcb06f..0abe41beb6c 100644
--- a/Build/source/utils/lcdf-typetools/t1reencode/t1reencode.1
+++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
@@ -1,4 +1,4 @@
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/utils/lcdf-typetools/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
index 0b561864cf1..0b561864cf1 100644
--- a/Build/source/utils/lcdf-typetools/t1reencode/t1reencode.cc
+++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
diff --git a/Build/source/utils/lcdf-typetools/t1reencode/util.cc b/Build/source/texk/lcdf-typetools/t1reencode/util.cc
index 7792eef4466..7792eef4466 100644
--- a/Build/source/utils/lcdf-typetools/t1reencode/util.cc
+++ b/Build/source/texk/lcdf-typetools/t1reencode/util.cc
diff --git a/Build/source/utils/lcdf-typetools/t1reencode/util.hh b/Build/source/texk/lcdf-typetools/t1reencode/util.hh
index 34b9c9c5a22..34b9c9c5a22 100644
--- a/Build/source/utils/lcdf-typetools/t1reencode/util.hh
+++ b/Build/source/texk/lcdf-typetools/t1reencode/util.hh
diff --git a/Build/source/utils/lcdf-typetools/t1testpage/Makefile.am b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.am
index 251c3ff697e..251c3ff697e 100644
--- a/Build/source/utils/lcdf-typetools/t1testpage/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
index 02df61e63eb..02df61e63eb 100644
--- a/Build/source/utils/lcdf-typetools/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1
index d3436e0fae9..e1d7aa95117 100644
--- a/Build/source/utils/lcdf-typetools/t1testpage/t1testpage.1
+++ b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1
@@ -1,4 +1,4 @@
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/utils/lcdf-typetools/t1testpage/t1testpage.cc b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
index 82901597316..e857a7ce157 100644
--- a/Build/source/utils/lcdf-typetools/t1testpage/t1testpage.cc
+++ b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
@@ -1,6 +1,6 @@
/* t1testpage.cc -- driver for generating Type 1 fonts' test pages
*
- * Copyright (c) 1999-2006 Eddie Kohler
+ * Copyright (c) 1999-2007 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
@@ -166,7 +166,8 @@ output_testpage(FILE* outf, Type1Font* font, const Vector<PermString>& glyph_nam
HashMap<PermString, int> encodings(-1);
if (Type1Encoding *encoding = font->type1_encoding())
for (int i = 255; i >= 0; i--)
- encodings.insert(encoding->elt(i), i);
+ if (encoding->elt(i))
+ encodings.insert(encoding->elt(i), i);
int per_row = 10;
int nrows = 13;
diff --git a/Build/source/utils/lcdf-typetools/texglyphlist.txt b/Build/source/texk/lcdf-typetools/texglyphlist.txt
index e22e80752e2..e22e80752e2 100644
--- a/Build/source/utils/lcdf-typetools/texglyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/texglyphlist.txt
diff --git a/Build/source/utils/lcdf-typetools/ttftotype42/Makefile.am b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.am
index 24206d0d0a3..24206d0d0a3 100644
--- a/Build/source/utils/lcdf-typetools/ttftotype42/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.am
diff --git a/Build/source/utils/lcdf-typetools/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
index a7bac6919e6..a7bac6919e6 100644
--- a/Build/source/utils/lcdf-typetools/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
diff --git a/Build/source/utils/lcdf-typetools/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1
index 02b7d428b1f..1718a8ec24e 100644
--- a/Build/source/utils/lcdf-typetools/ttftotype42/ttftotype42.1
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1
@@ -1,4 +1,4 @@
-.ds V 2.48
+.ds V 2.66
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/utils/lcdf-typetools/ttftotype42/ttftotype42.cc b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc
index 270038a9c05..3dc95dc90e2 100644
--- a/Build/source/utils/lcdf-typetools/ttftotype42/ttftotype42.cc
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc
@@ -241,14 +241,12 @@ do_file(const char *infn, const char *outfn, ErrorHandler *errh)
MD5_CONTEXT md5;
md5_init(&md5);
md5_update(&md5, (const unsigned char *) reduced_font.data(), reduced_font.length());
- union {
- unsigned char c[MD5_DIGEST_SIZE];
- uint32_t u[MD5_DIGEST_SIZE / 4];
- } result;
- md5_final(&result.c[0], &md5);
+ unsigned char result[MD5_DIGEST_SIZE + 3];
+ memset(result, 0, sizeof(result));
+ md5_final(result, &md5);
fprintf(f, "/XUID [42");
- for (int i = 0; i < MD5_DIGEST_SIZE / 4; i++)
- fprintf(f, " 16#%X", result.u[i]);
+ for (int i = 0; i < MD5_DIGEST_SIZE; i += 3)
+ fprintf(f, " 16#%X", result[i] + result[i+1]*256 + result[i+2]*256*256);
fprintf(f, "] def\n");
}
diff --git a/Build/source/texk/withenable.ac b/Build/source/texk/withenable.ac
index 430686ac20e..b6297f51ab4 100644
--- a/Build/source/texk/withenable.ac
+++ b/Build/source/texk/withenable.ac
@@ -1,58 +1,60 @@
dnl withenable.ac: --with and --enable options.
AC_ARG_WITH([afm2pl],
- [ --without-afm2pl do not build the afm2pl package])
+ [ --without-afm2pl do not build the afm2pl package])
AC_ARG_WITH([bibtex8],
- [ --without-bibtex8 do not build the bibtex8 package])
+ [ --without-bibtex8 do not build the bibtex8 package])
AC_ARG_WITH([cjkutils],
- [ --without-cjkutils do not build the cjkutils package])
+ [ --without-cjkutils do not build the cjkutils package])
AC_ARG_WITH([detex],
- [ --without-detex do not build the detex package])
+ [ --without-detex do not build the detex package])
AC_ARG_WITH([devnag],
- [ --without-devnag do not build the devnag package])
+ [ --without-devnag do not build the devnag package])
AC_ARG_WITH([dtl],
- [ --without-dtl do not build the dtl package])
+ [ --without-dtl do not build the dtl package])
AC_ARG_WITH([dvi2tty],
- [ --without-dvi2tty do not build the dvi2tty package])
+ [ --without-dvi2tty do not build the dvi2tty package])
AC_ARG_WITH([dvidvi],
- [ --without-dvidvi do not build the dvidvi package])
+ [ --without-dvidvi do not build the dvidvi package])
AC_ARG_WITH([dviljk],
- [ --without-dviljk do not build the dviljk package])
+ [ --without-dviljk do not build the dviljk package])
AC_ARG_WITH([dvipdfm],
- [ --without-dvipdfm do not build the dvipdfm package])
+ [ --without-dvipdfm do not build the dvipdfm package])
AC_ARG_WITH([dvipdfmx],
- [ --without-dvipdfmx do not build the dvipdfmx package])
+ [ --without-dvipdfmx do not build the dvipdfmx package])
AC_ARG_WITH([dvipng],
- [ --without-dvipng do not build the dvipng package])
+ [ --without-dvipng do not build the dvipng package])
AC_ARG_WITH([dvipos],
- [ --without-dvipos do not build the dvipos package])
+ [ --without-dvipos do not build the dvipos package])
AC_ARG_WITH([dvipsk],
- [ --without-dvipsk do not build the dvipsk package])
+ [ --without-dvipsk do not build the dvipsk package])
AC_ARG_WITH([gsftopk],
- [ --without-gsftopk do not build the gsftopk package])
+ [ --without-gsftopk do not build the gsftopk package])
AC_ARG_WITH([lacheck],
- [ --without-lacheck do not build the lacheck package])
+ [ --without-lacheck do not build the lacheck package])
+AC_ARG_WITH([lcdf-typetools],
+ [ --without-lcdf-typetools do not build the lcdf-typetools package])
AC_ARG_WITH([makeindexk],
- [ --without-makeindexk do not build the makeindexk package])
+ [ --without-makeindexk do not build the makeindexk package])
AC_ARG_WITH([musixflx],
- [ --without-musixflx do not build the musixflx package])
+ [ --without-musixflx do not build the musixflx package])
AC_ARG_WITH([ps2pkm],
- [ --without-ps2pkm do not build the ps2pkm package])
+ [ --without-ps2pkm do not build the ps2pkm package])
AC_ARG_WITH([seetexk],
- [ --without-seetexk do not build the seetexk package])
+ [ --without-seetexk do not build the seetexk package])
AC_ARG_WITH([tetex],
- [ --without-tetex do not build the tetex package])
+ [ --without-tetex do not build the tetex package])
AC_ARG_WITH([tex4htk],
- [ --without-tex4htk do not build the tex4htk package])
+ [ --without-tex4htk do not build the tex4htk package])
AC_ARG_WITH([texlive],
- [ --without-texlive do not build the texlive package])
+ [ --without-texlive do not build the texlive package])
AC_ARG_WITH([ttf2pk],
- [ --without-ttf2pk do not build the ttf2pk package])
+ [ --without-ttf2pk do not build the ttf2pk package])
AC_ARG_WITH([tth],
- [ --without-tth do not build the tth package])
+ [ --without-tth do not build the tth package])
AC_ARG_WITH([xdvik],
- [ --without-xdvik do not build the xdvik package])
+ [ --without-xdvik do not build the xdvik package])
AC_ARG_WITH([xdvipdfmx],
- [ --without-xdvipdfmx do not build the xdvipdfmx package])
+ [ --without-xdvipdfmx do not build the xdvipdfmx package])
AC_ARG_WITH([xdv2pdf],
- [ --without-xdv2pdf do not build the xdv2pdf package])
+ [ --without-xdv2pdf do not build the xdv2pdf package])
diff --git a/Build/source/utils/README b/Build/source/utils/README
index a06ec7941c8..300a1e76144 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -14,9 +14,6 @@ dialog - seems to be a v1.0 in debian, asked te 5jun05; he said keep as -is
http://hightek.org/dialog/
http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=dialog
-lcdf-typetools 2.48 - ok 13dec06
- http://www.lcdf.org/type/
-
mkjobtexmf 0.4 - ok 6sep07
http://www.ctan.org/tex-archive/support/mkjobtexmf
diff --git a/Build/source/withenable.ac b/Build/source/withenable.ac
index ccfff71643f..bfb217ec24e 100644
--- a/Build/source/withenable.ac
+++ b/Build/source/withenable.ac
@@ -8,9 +8,6 @@ AC_ARG_ENABLE([multiplatform],
AC_ARG_WITH([dialog],
[ --without-dialog do not build the dialog package])
-AC_ARG_WITH([lcdf-typetools],
- [ --without-lcdf-typetools do not build the lcdf-typetools package])
-
AC_ARG_WITH([mkjobtexmf],
[ --without-mkjobtexmf do not build the mkjobtexmf package])