summaryrefslogtreecommitdiff
path: root/Build/source/texk/lcdf-typetools
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-11 07:33:42 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-11 07:33:42 +0000
commite674c75b13a2805e2466ecbcfc4919e673e455ea (patch)
tree261dab62988fa5033e99becbe2db4ddc34e441e1 /Build/source/texk/lcdf-typetools
parent745d33c0e9895a6c74ebe2a401101c85d830a82f (diff)
lcdf-typetools 2.98
git-svn-id: svn://tug.org/texlive/trunk@29857 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools')
-rw-r--r--Build/source/texk/lcdf-typetools/ChangeLog5
-rw-r--r--Build/source/texk/lcdf-typetools/autoconf.h.in3
-rwxr-xr-xBuild/source/texk/lcdf-typetools/configure97
-rw-r--r--Build/source/texk/lcdf-typetools/configure.ac6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfdata.hh131
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/ChangeLog (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/ChangeLog)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/TL-Changes (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/TL-Changes)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-20-TL-binary (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-20-TL-binary)42
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-21-TL-paths (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-21-TL-paths)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-30-W32TeX (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-30-W32TeX)24
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/7t.enc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/7t.enc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/COPYING (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/COPYING)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/INSTALL (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/INSTALL)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/NEWS (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/NEWS)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ONEWS (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ONEWS)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/README (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/README)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/autoconf.h.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/autoconf.h.in)3
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/configure.ac (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/configure.ac)11
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphlist.txt (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphlist.txt)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphtounicode.tex (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphtounicode.tex)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/config.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/config.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afm.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmparse.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmparse.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmw.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmw.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/amfm.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/amfm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/cff.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/cff.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/encoding.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/encoding.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/findmet.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/findmet.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/metrics.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/metrics.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otf.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otf.hh)96
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfcmap.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfcmap.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfdata.hh239
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgpos.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgpos.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgsub.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgsub.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfname.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfname.hh)44
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfos2.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfos2.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfpost.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfpost.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/pairop.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/pairop.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/psres.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/psres.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1bounds.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1bounds.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1cs.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1cs.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1csgen.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1csgen.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1font.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1font.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1interp.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1interp.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1item.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1item.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1mm.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1mm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1rw.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1rw.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1unparser.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1unparser.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfcs.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfcs.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfhead.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfhead.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfkern.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfkern.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/bezier.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/bezier.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/clp.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/clp.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/error.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/error.hh)36
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/filename.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/filename.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/globmatch.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/globmatch.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashcode.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashcode.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/inttypes.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/inttypes.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/landmark.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/landmark.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/md5.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/md5.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/permstr.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/permstr.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/point.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/point.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/slurper.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/slurper.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/straccum.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/straccum.hh)8
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/string.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/string.hh)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/strtonum.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/strtonum.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/transform.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/transform.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/lcdf-typetools.spec (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/lcdf-typetools.spec)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afm.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmparse.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmparse.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmw.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmw.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/amfm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/amfm.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/cff.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/cff.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/encoding.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/encoding.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/findmet.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/findmet.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/metrics.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/metrics.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otf.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otf.cc)292
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfcmap.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfcmap.cc)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdata.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdata.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdescrip.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdescrip.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgpos.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgpos.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgsub.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgsub.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfname.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfname.cc)24
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfos2.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfos2.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfpost.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfpost.cc)8
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/pairop.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/pairop.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/psres.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/psres.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1bounds.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1bounds.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1cs.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1cs.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1csgen.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1csgen.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1font.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1font.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1fontskel.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1fontskel.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1interp.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1interp.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1item.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1item.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1mm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1mm.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1rw.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1rw.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1unparser.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1unparser.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfcs.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfcs.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfhead.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfhead.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfkern.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfkern.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/bezier.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/bezier.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/clp.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/clp.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/error.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/error.cc)52
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/filename.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/filename.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/fixlibc.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/fixlibc.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/globmatch.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/globmatch.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/landmark.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/landmark.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/md5.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/md5.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/permstr.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/permstr.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/point.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/point.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/slurper.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/slurper.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/straccum.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/straccum.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/string.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/string.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/strtonum.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/strtonum.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/transform.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/transform.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/vectorv.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/vectorv.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/m4/lcdf-typetools.m4 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/m4/lcdf-typetools.m4)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/main.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/main.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/mmafm.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/mmafm.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/main.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/main.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/mmpfb.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/mmpfb.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist-g2u.txt (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist-g2u.txt)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist.txt (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist.txt)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.1)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/version.ac4
203 files changed, 697 insertions, 570 deletions
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
index e58a272937b..b8ea9ed4909 100644
--- a/Build/source/texk/lcdf-typetools/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import lcdf-typetools-2.98.
+ * version.ac, configure.ac: Adapted.
+
2012-12-30 Karl Berry <karl@tug.org>
* configure.ac (AC_CONFIG_HEADERS): use instead of AM_CONFIG_HEADER,
diff --git a/Build/source/texk/lcdf-typetools/autoconf.h.in b/Build/source/texk/lcdf-typetools/autoconf.h.in
index 20d78acacdd..f0c4219b9bd 100644
--- a/Build/source/texk/lcdf-typetools/autoconf.h.in
+++ b/Build/source/texk/lcdf-typetools/autoconf.h.in
@@ -139,6 +139,9 @@
/* Define if PermStrings are available. */
#undef HAVE_PERMSTRING
+/* Define to include precondition checking assertions. */
+#undef HAVE_PRECONDITION_CHECKING
+
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index ddd88857e14..d68d68584e4 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for LCDF typetools for TeX Live 2.97.
+# Generated by GNU Autoconf 2.69 for LCDF typetools for TeX Live 2.98.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,12 +590,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='LCDF typetools for TeX Live'
PACKAGE_TARNAME='lcdf-typetools-for-tex-live'
-PACKAGE_VERSION='2.97'
-PACKAGE_STRING='LCDF typetools for TeX Live 2.97'
+PACKAGE_VERSION='2.98'
+PACKAGE_STRING='LCDF typetools for TeX Live 2.98'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="lcdf-typetools-2.97/NEWS"
+ac_unique_file="lcdf-typetools-2.98/NEWS"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -793,6 +793,7 @@ with_gnu_ld
with_sysroot
enable_libtool_lock
enable_largefile
+enable_precondition_checking
enable_cxx_runtime_hack
enable_cfftot1
enable_mmafm
@@ -1365,7 +1366,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures LCDF typetools for TeX Live 2.97 to adapt to many kinds of systems.
+\`configure' configures LCDF typetools for TeX Live 2.98 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1436,7 +1437,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.97:";;
+ short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.98:";;
esac
cat <<\_ACEOF
@@ -1462,6 +1463,8 @@ Optional Features:
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-largefile omit support for large files
+ --enable-precondition-checking
+ include precondition checking assertions
--enable-cxx-runtime-hack link C++ runtime statically
--disable-cfftot1 do not build the cfftot1 program
--disable-mmafm do not build the mmafm program
@@ -1576,7 +1579,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LCDF typetools for TeX Live configure 2.97
+LCDF typetools for TeX Live configure 2.98
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2736,7 +2739,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by LCDF typetools for TeX Live $as_me 2.97, which was
+It was created by LCDF typetools for TeX Live $as_me 2.98, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8167,7 +8170,7 @@ fi
# Define the identity of the package.
PACKAGE='lcdf-typetools-for-tex-live'
- VERSION='2.97'
+ VERSION='2.98'
cat >>confdefs.h <<_ACEOF
@@ -13421,7 +13424,7 @@ fi
-LCDF_TYPETOOLS_VERSION=2.97
+LCDF_TYPETOOLS_VERSION=2.98
ac_config_headers="$ac_config_headers autoconf.h"
@@ -17194,6 +17197,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC="$CC $WARNING_CFLAGS"
CXX="$CXX $WARNING_CXXFLAGS"
+# Check whether --enable-precondition-checking was given.
+if test "${enable_precondition_checking+set}" = set; then :
+ enableval=$enable_precondition_checking; if test "$enableval" = yes; then
+
+$as_echo "#define HAVE_PRECONDITION_CHECKING 1" >>confdefs.h
+
+ fi
+fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where template objects are stored" >&5
$as_echo_n "checking where template objects are stored... " >&6; }
if ${ac_cv_cxx_templobjs+:} false; then :
@@ -19087,7 +19100,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-LCDF typetools for TeX Live config.lt 2.97
+LCDF typetools for TeX Live config.lt 2.98
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20576,24 +20589,24 @@ _ACEOF
-LCDF_TYPETOOLS_TREE=lcdf-typetools-2.97
+LCDF_TYPETOOLS_TREE=lcdf-typetools-2.98
-ac_config_files="$ac_config_files Makefile lcdf-typetools-2.97/Makefile"
+ac_config_files="$ac_config_files Makefile lcdf-typetools-2.98/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/liblcdf/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/libefont/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/cfftot1/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/mmafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/mmpfb/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/otfinfo/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/otftotfm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/t1dotlessj/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/t1lint/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/t1rawafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/t1reencode/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/t1testpage/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.97/ttftotype42/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/liblcdf/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/libefont/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/cfftot1/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/mmafm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/mmpfb/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/otfinfo/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/otftotfm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/t1dotlessj/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/t1lint/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/t1rawafm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/t1reencode/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/t1testpage/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.98/ttftotype42/Makefile"
cat >confcache <<\_ACEOF
@@ -21147,7 +21160,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by LCDF typetools for TeX Live $as_me 2.97, which was
+This file was extended by LCDF typetools for TeX Live $as_me 2.98, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21213,7 +21226,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-LCDF typetools for TeX Live config.status 2.97
+LCDF typetools for TeX Live config.status 2.98
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -21726,20 +21739,20 @@ do
"autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconf.h" ;;
"CXXLD.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS CXXLD.sh" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "lcdf-typetools-2.97/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/Makefile" ;;
- "lcdf-typetools-2.97/liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/liblcdf/Makefile" ;;
- "lcdf-typetools-2.97/libefont/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/libefont/Makefile" ;;
- "lcdf-typetools-2.97/cfftot1/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/cfftot1/Makefile" ;;
- "lcdf-typetools-2.97/mmafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/mmafm/Makefile" ;;
- "lcdf-typetools-2.97/mmpfb/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/mmpfb/Makefile" ;;
- "lcdf-typetools-2.97/otfinfo/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/otfinfo/Makefile" ;;
- "lcdf-typetools-2.97/otftotfm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/otftotfm/Makefile" ;;
- "lcdf-typetools-2.97/t1dotlessj/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1dotlessj/Makefile" ;;
- "lcdf-typetools-2.97/t1lint/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1lint/Makefile" ;;
- "lcdf-typetools-2.97/t1rawafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1rawafm/Makefile" ;;
- "lcdf-typetools-2.97/t1reencode/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1reencode/Makefile" ;;
- "lcdf-typetools-2.97/t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/t1testpage/Makefile" ;;
- "lcdf-typetools-2.97/ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.97/ttftotype42/Makefile" ;;
+ "lcdf-typetools-2.98/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/Makefile" ;;
+ "lcdf-typetools-2.98/liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/liblcdf/Makefile" ;;
+ "lcdf-typetools-2.98/libefont/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/libefont/Makefile" ;;
+ "lcdf-typetools-2.98/cfftot1/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/cfftot1/Makefile" ;;
+ "lcdf-typetools-2.98/mmafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/mmafm/Makefile" ;;
+ "lcdf-typetools-2.98/mmpfb/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/mmpfb/Makefile" ;;
+ "lcdf-typetools-2.98/otfinfo/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/otfinfo/Makefile" ;;
+ "lcdf-typetools-2.98/otftotfm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/otftotfm/Makefile" ;;
+ "lcdf-typetools-2.98/t1dotlessj/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1dotlessj/Makefile" ;;
+ "lcdf-typetools-2.98/t1lint/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1lint/Makefile" ;;
+ "lcdf-typetools-2.98/t1rawafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1rawafm/Makefile" ;;
+ "lcdf-typetools-2.98/t1reencode/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1reencode/Makefile" ;;
+ "lcdf-typetools-2.98/t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/t1testpage/Makefile" ;;
+ "lcdf-typetools-2.98/ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.98/ttftotype42/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac
index f8e32fca352..94618b01520 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -34,6 +34,12 @@ AC_PROG_CXXCPP
CC="$CC $WARNING_CFLAGS"
CXX="$CXX $WARNING_CXXFLAGS"
+AC_ARG_ENABLE([precondition-checking],
+ [AS_HELP_STRING([--enable-precondition-checking], [include precondition checking assertions])],
+ [if test "$enableval" = yes; then
+ AC_DEFINE([HAVE_PRECONDITION_CHECKING], [1], [Define to include precondition checking assertions.])
+ fi])
+
AC_CXX_TEMPLATE_OBJS
KPSE_CXX_HACK
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfdata.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfdata.hh
deleted file mode 100644
index 18fd894d5d2..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfdata.hh
+++ /dev/null
@@ -1,131 +0,0 @@
-// -*- related-file-name: "../../libefont/otfdata.cc" -*-
-#ifndef EFONT_OTFDATA_HH
-#define EFONT_OTFDATA_HH
-#include <lcdf/string.hh>
-#include <lcdf/vector.hh>
-#include <lcdf/inttypes.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if NEED_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#if HAVE_BYTEORDER_H
-# include <byteorder.h>
-#elif HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#elif HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#elif !defined(WIN32)
-# error "configury disaster! Report this error to ekohler@gmail.com"
-#endif
-#ifdef WIN32
-# ifdef __MSC_VER
-# pragma warning (disable: 4290)
-# endif
-# include <winsock2.h>
-#endif
-class ErrorHandler;
-namespace Efont { namespace OpenType {
-
-class Error { public:
- String description;
- Error() : description(String::make_stable("unspecified error")) { }
- Error(const String &d) : description(d) { }
-};
-
-class Bounds : public Error { public:
- Bounds() : Error(String::make_stable("bounds error")) { }
-};
-
-class Format : public Error { public:
- Format(const String& name) : Error(name + " format error") { }
- Format(const String& name, const String& type)
- : Error(name + " " + type + " format error") { }
-};
-
-class BlankTable : public Format { public:
- BlankTable(const String& name) : Format(name, "blank table") { }
-};
-
-class Data { public:
-
- Data() { }
- Data(const String& str) : _str(str) { _str.align(2); }
- // default copy constructor
- // default destructor
-
- operator const String&() const { return _str; }
-
- operator bool() const { return _str; }
- const uint8_t *udata() const { return _str.udata(); }
- int length() const { return _str.length(); }
-
- inline uint8_t operator[](unsigned offset) const throw (Bounds);
- inline uint16_t u16(unsigned offset) const throw (Bounds);
- inline int16_t s16(unsigned offset) const throw (Bounds);
- inline uint32_t u32(unsigned offset) const throw (Bounds);
- inline int32_t s32(unsigned offset) const throw (Bounds);
-
- Data subtable(unsigned offset) const throw (Bounds);
- Data offset_subtable(unsigned offset_offset) const throw (Bounds);
- inline Data substring(int left, int len = -1) const throw ();
-
- void align_long() { _str.align(4); }
-
- private:
-
- String _str;
-
-};
-
-inline uint8_t Data::operator[](unsigned offset) const throw (Bounds)
-{
- if (offset >= static_cast<unsigned>(_str.length()))
- throw Bounds();
- else
- return _str[offset];
-}
-
-inline uint16_t Data::u16(unsigned offset) const throw (Bounds)
-{
- if (offset + 1 >= static_cast<unsigned>(_str.length()) || offset + 1 == 0)
- throw Bounds();
- else
- return ntohs(*reinterpret_cast<const uint16_t *>(_str.data() + offset));
-}
-
-inline int16_t Data::s16(unsigned offset) const throw (Bounds)
-{
- if (offset + 1 >= static_cast<unsigned>(_str.length()) || offset + 1 == 0)
- throw Bounds();
- else
- return ntohs(*reinterpret_cast<const int16_t *>(_str.data() + offset));
-}
-
-inline uint32_t Data::u32(unsigned offset) const throw (Bounds)
-{
- if (offset + 3 >= static_cast<unsigned>(_str.length()) || offset + 3 < 3)
- throw Bounds();
- else
- return (ntohs(*reinterpret_cast<const uint16_t *>(_str.data() + offset)) << 16)
- | ntohs(*reinterpret_cast<const uint16_t *>(_str.data() + offset + 2));
-}
-
-inline int32_t Data::s32(unsigned offset) const throw (Bounds)
-{
- if (offset + 3 >= static_cast<unsigned>(_str.length()) || offset + 3 < 3)
- throw Bounds();
- else
- return (ntohs(*reinterpret_cast<const uint16_t *>(_str.data() + offset)) << 16)
- | ntohs(*reinterpret_cast<const uint16_t *>(_str.data() + offset + 2));
-}
-
-inline Data
-Data::substring(int left, int len) const throw ()
-{
- return Data(_str.substring(left, len));
-}
-
-}}
-#endif
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/ChangeLog
index 5b913b05971..be18029d465 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import lcdf-typetools-2.98.
+
+ * patch-20-TL-binary, patch-21-TL-paths, patch-30-W32TeX: Adapted.
+
2012-10-26 Peter Breitenlohner <peb@mppmu.mpg.de>
Import lcdf-typetools-2.97.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/TL-Changes
index a82f6b8da36..80d1c47900a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/TL-Changes
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
Changes applied to the lcdf-typetools tree as obtained from:
- http://www.lcdf.org/type/lcdf-typetools-2.97.tar.gz
+ http://www.lcdf.org/type/lcdf-typetools-2.98.tar.gz
Removed:
aclocal.m4
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-20-TL-binary b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-20-TL-binary
index 86a06130411..464df8f52f9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-20-TL-binary
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-20-TL-binary
@@ -1,8 +1,8 @@
In TeX Live we treat all output files as binary.
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/liblcdf/filename.cc lcdf-typetools-2.97/liblcdf/filename.cc
---- lcdf-typetools-2.97.orig/liblcdf/filename.cc 2012-08-15 17:33:48.000000000 +0200
-+++ lcdf-typetools-2.97/liblcdf/filename.cc 2012-10-26 08:31:26.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/liblcdf/filename.cc lcdf-typetools-2.98/liblcdf/filename.cc
+--- lcdf-typetools-2.98.orig/liblcdf/filename.cc 2012-08-16 15:02:19.000000000 +0200
++++ lcdf-typetools-2.98/liblcdf/filename.cc 2013-04-11 09:17:37.000000000 +0200
@@ -126,5 +126,5 @@
if (_actual || !_path)
return _actual;
@@ -10,9 +10,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
- return fopen(_path.c_str(), binary ? "wb" : "w");
+ return fopen(_path.c_str(), "wb");
}
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/automatic.cc lcdf-typetools-2.97/otftotfm/automatic.cc
---- lcdf-typetools-2.97.orig/otftotfm/automatic.cc 2012-10-25 15:54:40.000000000 +0200
-+++ lcdf-typetools-2.97/otftotfm/automatic.cc 2012-10-26 08:31:26.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/automatic.cc lcdf-typetools-2.98/otftotfm/automatic.cc
+--- lcdf-typetools-2.98.orig/otftotfm/automatic.cc 2012-11-21 23:30:45.000000000 +0100
++++ lcdf-typetools-2.98/otftotfm/automatic.cc 2013-04-11 09:17:37.000000000 +0200
@@ -311,7 +311,7 @@
String ls_r = writable_texdir + "ls-R";
bool success = false;
@@ -31,9 +31,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
fd = fileno(f);
}
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/otftotfm.cc lcdf-typetools-2.97/otftotfm/otftotfm.cc
---- lcdf-typetools-2.97.orig/otftotfm/otftotfm.cc 2012-10-25 14:25:12.000000000 +0200
-+++ lcdf-typetools-2.97/otftotfm/otftotfm.cc 2012-10-26 08:31:26.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/otftotfm.cc lcdf-typetools-2.98/otftotfm/otftotfm.cc
+--- lcdf-typetools-2.98.orig/otftotfm/otftotfm.cc 2012-11-21 23:30:45.000000000 +0100
++++ lcdf-typetools-2.98/otftotfm/otftotfm.cc 2013-04-11 09:17:37.000000000 +0200
@@ -555,7 +555,7 @@
if (verbose)
@@ -52,9 +52,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
fd = fileno(f);
}
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.97/t1dotlessj/t1dotlessj.cc
---- lcdf-typetools-2.97.orig/t1dotlessj/t1dotlessj.cc 2012-08-15 17:34:28.000000000 +0200
-+++ lcdf-typetools-2.97/t1dotlessj/t1dotlessj.cc 2012-10-26 08:31:26.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc
+--- lcdf-typetools-2.98.orig/t1dotlessj/t1dotlessj.cc 2012-08-16 15:02:19.000000000 +0200
++++ lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc 2013-04-11 09:17:37.000000000 +0200
@@ -403,10 +403,10 @@
// write it to output
if (!outputf)
@@ -68,9 +68,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
Type1PFBWriter w(outputf);
dotless_font->write(w);
} else {
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.97/t1rawafm/t1rawafm.cc
---- lcdf-typetools-2.97.orig/t1rawafm/t1rawafm.cc 2012-10-25 15:54:40.000000000 +0200
-+++ lcdf-typetools-2.97/t1rawafm/t1rawafm.cc 2012-10-26 08:31:26.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.98/t1rawafm/t1rawafm.cc
+--- lcdf-typetools-2.98.orig/t1rawafm/t1rawafm.cc 2012-11-21 23:30:45.000000000 +0100
++++ lcdf-typetools-2.98/t1rawafm/t1rawafm.cc 2013-04-11 09:17:37.000000000 +0200
@@ -352,6 +352,9 @@
if (!outf)
errh->fatal("%s: %s", output_file, strerror(errno));
@@ -81,9 +81,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
write_afm(outf, font);
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/t1reencode/t1reencode.cc lcdf-typetools-2.97/t1reencode/t1reencode.cc
---- lcdf-typetools-2.97.orig/t1reencode/t1reencode.cc 2012-10-25 15:54:40.000000000 +0200
-+++ lcdf-typetools-2.97/t1reencode/t1reencode.cc 2012-10-26 08:31:26.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/t1reencode/t1reencode.cc lcdf-typetools-2.98/t1reencode/t1reencode.cc
+--- lcdf-typetools-2.98.orig/t1reencode/t1reencode.cc 2012-11-21 23:30:45.000000000 +0100
++++ lcdf-typetools-2.98/t1reencode/t1reencode.cc 2013-04-11 09:17:37.000000000 +0200
@@ -1094,10 +1094,10 @@
if (!outf)
errh->fatal("%s: %s", output_file, strerror(errno));
@@ -97,9 +97,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
Type1PFBWriter w(outf);
font->write(w);
} else {
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/t1testpage/t1testpage.cc lcdf-typetools-2.97/t1testpage/t1testpage.cc
---- lcdf-typetools-2.97.orig/t1testpage/t1testpage.cc 2012-08-15 17:34:38.000000000 +0200
-+++ lcdf-typetools-2.97/t1testpage/t1testpage.cc 2012-10-26 08:31:26.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/t1testpage/t1testpage.cc lcdf-typetools-2.98/t1testpage/t1testpage.cc
+--- lcdf-typetools-2.98.orig/t1testpage/t1testpage.cc 2012-08-16 15:02:19.000000000 +0200
++++ lcdf-typetools-2.98/t1testpage/t1testpage.cc 2013-04-11 09:17:37.000000000 +0200
@@ -665,6 +665,9 @@
if (!outf)
errh->fatal("%s: %s", output_file, strerror(errno));
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-21-TL-paths b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-21-TL-paths
index 138dc4f46a2..3f7507c3dd7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-21-TL-paths
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-21-TL-paths
@@ -1,6 +1,6 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/automatic.cc lcdf-typetools-2.97/otftotfm/automatic.cc
---- lcdf-typetools-2.97.orig/otftotfm/automatic.cc 2012-10-26 08:31:26.000000000 +0200
-+++ lcdf-typetools-2.97/otftotfm/automatic.cc 2012-10-26 08:35:40.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/automatic.cc lcdf-typetools-2.98/otftotfm/automatic.cc
+--- lcdf-typetools-2.98.orig/otftotfm/automatic.cc 2013-04-11 09:17:37.000000000 +0200
++++ lcdf-typetools-2.98/otftotfm/automatic.cc 2013-04-11 09:20:12.000000000 +0200
@@ -321,7 +321,11 @@
if (!success && writable_texdir.find_left('\'') < 0 && directory.find_left('\'') < 0 && file.find_left('\'') < 0) {
// look for mktexupd script
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-30-W32TeX b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-30-W32TeX
index 7eb0899e84b..761a12d7113 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97-PATCHES/patch-30-W32TeX
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98-PATCHES/patch-30-W32TeX
@@ -1,6 +1,6 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/automatic.cc lcdf-typetools-2.97/otftotfm/automatic.cc
---- lcdf-typetools-2.97.orig/otftotfm/automatic.cc 2012-10-26 08:35:40.000000000 +0200
-+++ lcdf-typetools-2.97/otftotfm/automatic.cc 2012-10-26 08:36:32.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/automatic.cc lcdf-typetools-2.98/otftotfm/automatic.cc
+--- lcdf-typetools-2.98.orig/otftotfm/automatic.cc 2013-04-11 09:20:12.000000000 +0200
++++ lcdf-typetools-2.98/otftotfm/automatic.cc 2013-04-11 09:21:35.000000000 +0200
@@ -124,7 +124,18 @@
static void
find_writable_texdir(ErrorHandler *errh, const char *)
@@ -35,9 +35,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + CMD_SEP " updmap";
if (verbose)
command += " 1>&2";
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/kpseinterface.c lcdf-typetools-2.97/otftotfm/kpseinterface.c
---- lcdf-typetools-2.97.orig/otftotfm/kpseinterface.c 2012-10-25 14:25:12.000000000 +0200
-+++ lcdf-typetools-2.97/otftotfm/kpseinterface.c 2012-10-26 08:36:32.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/kpseinterface.c lcdf-typetools-2.98/otftotfm/kpseinterface.c
+--- lcdf-typetools-2.98.orig/otftotfm/kpseinterface.c 2012-08-16 15:02:19.000000000 +0200
++++ lcdf-typetools-2.98/otftotfm/kpseinterface.c 2013-04-11 09:21:35.000000000 +0200
@@ -11,24 +11,112 @@
* Public License for more details.
*/
@@ -229,9 +229,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
+ return (char *)pkpse_var_value(var);
+}
+#endif
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/kpseinterface.h lcdf-typetools-2.97/otftotfm/kpseinterface.h
---- lcdf-typetools-2.97.orig/otftotfm/kpseinterface.h 2011-11-03 17:51:58.000000000 +0100
-+++ lcdf-typetools-2.97/otftotfm/kpseinterface.h 2012-10-26 08:36:32.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/kpseinterface.h lcdf-typetools-2.98/otftotfm/kpseinterface.h
+--- lcdf-typetools-2.98.orig/otftotfm/kpseinterface.h 2010-05-30 02:00:16.000000000 +0200
++++ lcdf-typetools-2.98/otftotfm/kpseinterface.h 2013-04-11 09:21:35.000000000 +0200
@@ -13,6 +13,13 @@
char* kpsei_find_file(const char* name, int format);
void kpsei_set_debug_flags(unsigned flags);
@@ -246,9 +246,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
#ifdef __cplusplus
}
#endif
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.97.orig/otftotfm/otftotfm.cc lcdf-typetools-2.97/otftotfm/otftotfm.cc
---- lcdf-typetools-2.97.orig/otftotfm/otftotfm.cc 2012-10-26 08:31:26.000000000 +0200
-+++ lcdf-typetools-2.97/otftotfm/otftotfm.cc 2012-10-26 08:36:32.000000000 +0200
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.98.orig/otftotfm/otftotfm.cc lcdf-typetools-2.98/otftotfm/otftotfm.cc
+--- lcdf-typetools-2.98.orig/otftotfm/otftotfm.cc 2013-04-11 09:17:37.000000000 +0200
++++ lcdf-typetools-2.98/otftotfm/otftotfm.cc 2013-04-11 09:21:35.000000000 +0200
@@ -1739,6 +1739,11 @@
}
}
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/7t.enc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/7t.enc
index 727f29e5f8c..727f29e5f8c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/7t.enc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/7t.enc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/COPYING b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/COPYING
index 67572846722..67572846722 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/COPYING
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/COPYING
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/INSTALL b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/INSTALL
index 95d84c820fb..95d84c820fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/INSTALL
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/INSTALL
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.am
index de0535c5252..de0535c5252 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.in
index d549ef19f72..59f91d89017 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/Makefile.in
@@ -50,7 +50,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = lcdf-typetools-2.97
+subdir = lcdf-typetools-2.98
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am COPYING \
INSTALL NEWS README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -390,9 +390,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/NEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/NEWS
index 3ecdf0b7252..d146d746d0c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/NEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/NEWS
@@ -1,5 +1,11 @@
LCDF Typetools NEWS
+Version 2.98 10.Apr.2013
+
+* Fix alignment bug that corrupted output fonts on some platforms
+ (MIPS especially). Reported by Norbert Preining.
+
+
Version 2.97 25.Oct.2012
* Same.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ONEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ONEWS
index 6bd9dc8c42d..6bd9dc8c42d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ONEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ONEWS
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/README b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/README
index fbd7bdd85b9..9451c0fb4ce 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/README
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/README
@@ -1,4 +1,4 @@
-LCDF-TYPETOOLS 2.97
+LCDF-TYPETOOLS 2.98
===================
USAGE
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/autoconf.h.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/autoconf.h.in
index 112122b274d..353e9a004a9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/autoconf.h.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/autoconf.h.in
@@ -91,6 +91,9 @@
/* Define if PermStrings are available. */
#undef HAVE_PERMSTRING
+/* Define to include precondition checking assertions. */
+#undef HAVE_PRECONDITION_CHECKING
+
/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.am
index 81d5365b976..81d5365b976 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.in
index b92ef76fff2..4c7d7932b67 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = cfftot1$(EXEEXT)
-subdir = lcdf-typetools-2.97/cfftot1
+subdir = lcdf-typetools-2.98/cfftot1
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -345,9 +345,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/cfftot1/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/cfftot1/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/cfftot1/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/cfftot1/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.1
index a7589aa08c3..f5d13744645 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.1
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.cc
index fe719e86d56..fe719e86d56 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/cfftot1.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/cfftot1.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.cc
index 21b632e50d9..21b632e50d9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.hh
index 75f2527897f..75f2527897f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/maket1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/cfftot1/maket1font.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/configure.ac b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/configure.ac
index a7c07e6534f..d08fc566265 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/configure.ac
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/configure.ac
@@ -1,8 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([lcdf-typetools], [2.97])
+AC_INIT([lcdf-typetools], [2.98])
AC_CONFIG_SRCDIR([NEWS])
AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER([autoconf.h])
+AC_CONFIG_HEADERS([autoconf.h])
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
@@ -18,6 +18,13 @@ AC_ARG_ENABLE([warnings],
CFLAGS="$CFLAGS -W -Wall"; CXXFLAGS="$CXXFLAGS -W -Wall"
fi])
+AC_ARG_ENABLE([precondition-checking],
+ [AS_HELP_STRING([--enable-precondition-checking], [include precondition checking assertions])],
+ [if test "$enableval" = yes; then
+ AC_DEFINE([HAVE_PRECONDITION_CHECKING], [1], [Define to include precondition checking assertions.])
+ fi])
+
+
dnl AN_MAKEVAR([AR], [AC_PROG_AR])
dnl AN_PROGRAM([ar], [AC_PROG_AR])
dnl AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphlist.txt
index 0304ffc6674..0304ffc6674 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphlist.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphtounicode.tex b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphtounicode.tex
index adaf8c82fc1..adaf8c82fc1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/glyphtounicode.tex
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/glyphtounicode.tex
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/config.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/config.h
index 26a90a97b14..26a90a97b14 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/config.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/config.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afm.hh
index f462e0079a4..f462e0079a4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmparse.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmparse.hh
index c29d990ceab..c29d990ceab 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmparse.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmparse.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmw.hh
index 4eda701b688..4eda701b688 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/afmw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/afmw.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/amfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/amfm.hh
index 6cc1db90b6e..6cc1db90b6e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/amfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/amfm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/cff.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/cff.hh
index f965bd60c07..f965bd60c07 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/cff.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/cff.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/encoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/encoding.hh
index fd8d749acec..fd8d749acec 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/encoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/encoding.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/findmet.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/findmet.hh
index 74b3ecee141..74b3ecee141 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/findmet.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/findmet.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/metrics.hh
index 21a5f1796fb..21a5f1796fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otf.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otf.hh
index 88e4fbfce4d..c7ea95a813d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otf.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otf.hh
@@ -10,8 +10,8 @@ class Name;
typedef int Glyph; // 16-bit integer
-class Tag { public:
-
+class Tag {
+ public:
Tag() : _tag(0U) { }
explicit Tag(uint32_t tag) : _tag(tag) { }
Tag(const char *name);
@@ -34,13 +34,11 @@ class Tag { public:
const char* feature_description() const;
private:
-
uint32_t _tag;
-
};
-class Font { public:
-
+class Font {
+ public:
Font(const String&, ErrorHandler* = 0);
// default destructor
@@ -65,16 +63,14 @@ class Font { public:
enum { HEADER_SIZE = 12, TABLE_DIR_ENTRY_SIZE = 16 };
private:
-
String _str;
int _error;
int parse_header(ErrorHandler*);
-
};
-class ScriptList { public:
-
+class ScriptList {
+ public:
ScriptList() { }
inline ScriptList(const String&, ErrorHandler* = 0);
int assign(const String&, ErrorHandler* = 0);
@@ -86,7 +82,6 @@ class ScriptList { public:
int features(Tag script, Tag langsys, int& required_fid, Vector<int>& fids, ErrorHandler* = 0, bool clear_fids = true) const;
private:
-
enum { SCRIPTLIST_HEADERSIZE = 2, SCRIPT_RECSIZE = 6,
SCRIPT_HEADERSIZE = 4, LANGSYS_RECSIZE = 6,
LANGSYS_HEADERSIZE = 6, FEATURE_RECSIZE = 2 };
@@ -97,11 +92,10 @@ class ScriptList { public:
int script_offset(Tag) const;
int check_script(Tag, int, ErrorHandler*) const;
int langsys_offset(Tag, Tag, ErrorHandler* = 0) const;
-
};
-class FeatureList { public:
-
+class FeatureList {
+ public:
FeatureList() { }
inline FeatureList(const String&, ErrorHandler* = 0);
int assign(const String&, ErrorHandler* = 0);
@@ -124,7 +118,6 @@ class FeatureList { public:
int lookups(const ScriptList&, Tag script, Tag langsys, const Vector<Tag>& sorted_ftags, Vector<int>& results, ErrorHandler* = 0) const;
private:
-
enum { FEATURELIST_HEADERSIZE = 2, FEATURE_RECSIZE = 6,
FEATURE_HEADERSIZE = 4, LOOKUPLIST_RECSIZE = 2 };
@@ -133,11 +126,10 @@ class FeatureList { public:
int check_header(ErrorHandler*);
int script_offset(Tag) const;
int langsys_offset(Tag, Tag, ErrorHandler* = 0) const;
-
};
-class Coverage { public:
-
+class Coverage {
+ public:
Coverage() throw (); // empty coverage
Coverage(Glyph first, Glyph last) throw (); // range coverage
Coverage(const Vector<bool> &gmap) throw (); // used-bytemap coverage
@@ -196,23 +188,20 @@ class Coverage { public:
HEADERSIZE = 4, LIST_RECSIZE = 2, RANGES_RECSIZE = 6 };
private:
-
String _str;
int check(ErrorHandler*);
-
};
Coverage operator&(const Coverage&, const Coverage&);
bool operator<=(const Coverage&, const Coverage&);
-inline bool operator>=(const Coverage& a, const Coverage& b)
-{
+inline bool operator>=(const Coverage& a, const Coverage& b) {
return b <= a;
}
-class GlyphSet { public:
-
+class GlyphSet {
+ public:
GlyphSet();
GlyphSet(const GlyphSet&);
~GlyphSet();
@@ -226,7 +215,6 @@ class GlyphSet { public:
GlyphSet& operator=(const GlyphSet&);
private:
-
enum { GLYPHBITS = 16, SHIFT = 8,
MAXGLYPH = (1 << GLYPHBITS) - 1, UNSHIFT = GLYPHBITS - SHIFT,
MASK = (1 << UNSHIFT) - 1, VLEN = (1 << SHIFT),
@@ -234,11 +222,10 @@ class GlyphSet { public:
};
uint32_t* _v[VLEN];
-
};
-class ClassDef { public:
-
+class ClassDef {
+ public:
ClassDef(const String&, ErrorHandler* = 0) throw ();
// default destructor
@@ -251,7 +238,8 @@ class ClassDef { public:
void unparse(StringAccum&) const throw ();
String unparse() const throw ();
- class class_iterator { public:
+ class class_iterator {
+ public:
// private constructor
// default destructor
@@ -294,80 +282,65 @@ class ClassDef { public:
RANGES_HEADERSIZE = 4, RANGES_RECSIZE = 6 };
private:
-
String _str;
int check(ErrorHandler*);
-
};
extern Vector<PermString> debug_glyph_names;
-inline bool operator==(Tag t1, uint32_t t2)
-{
+inline bool operator==(Tag t1, uint32_t t2) {
return t1.value() == t2;
}
-inline bool operator!=(Tag t1, uint32_t t2)
-{
+inline bool operator!=(Tag t1, uint32_t t2) {
return t1.value() != t2;
}
-inline bool operator<(Tag t1, uint32_t t2)
-{
+inline bool operator<(Tag t1, uint32_t t2) {
return t1.value() < t2;
}
-inline bool operator>(Tag t1, uint32_t t2)
-{
+inline bool operator>(Tag t1, uint32_t t2) {
return t1.value() > t2;
}
-inline bool operator<=(Tag t1, uint32_t t2)
-{
+inline bool operator<=(Tag t1, uint32_t t2) {
return t1.value() <= t2;
}
-inline bool operator>=(Tag t1, uint32_t t2)
-{
+inline bool operator>=(Tag t1, uint32_t t2) {
return t1.value() >= t2;
}
-inline bool operator==(Tag t1, Tag t2)
-{
+inline bool operator==(Tag t1, Tag t2) {
return t1.value() == t2.value();
}
-inline bool operator!=(Tag t1, Tag t2)
-{
+inline bool operator!=(Tag t1, Tag t2) {
return t1.value() != t2.value();
}
-inline bool operator<(Tag t1, Tag t2)
-{
+inline bool operator<(Tag t1, Tag t2) {
return t1.value() < t2.value();
}
-inline ScriptList::ScriptList(const String& str, ErrorHandler* errh)
-{
+inline ScriptList::ScriptList(const String& str, ErrorHandler* errh) {
assign(str, errh);
}
-inline FeatureList::FeatureList(const String& str, ErrorHandler* errh)
-{
+inline FeatureList::FeatureList(const String& str, ErrorHandler* errh) {
assign(str, errh);
}
-inline void FeatureList::filter(Vector<int>& fids, Tag ftag) const
-{
+inline void FeatureList::filter(Vector<int>& fids, Tag ftag) const {
Vector<Tag> tags;
tags.push_back(ftag);
filter(fids, tags);
}
-inline bool GlyphSet::covers(Glyph g) const
-{
+inline bool GlyphSet::covers(Glyph g) const {
if ((unsigned)g > MAXGLYPH)
return false;
else if (const uint32_t* u = _v[g >> SHIFT])
@@ -376,15 +349,14 @@ inline bool GlyphSet::covers(Glyph g) const
return false;
}
-inline bool GlyphSet::operator[](Glyph g) const
-{
+inline bool GlyphSet::operator[](Glyph g) const {
return covers(g);
}
-}}
+} // namespace Efont::OpenType
+} // namespace Efont
-inline hashcode_t hashcode(Efont::OpenType::Tag t)
-{
+inline hashcode_t hashcode(Efont::OpenType::Tag t) {
return t.value();
}
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfcmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfcmap.hh
index f95a3dc5c41..f95a3dc5c41 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfcmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfcmap.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfdata.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfdata.hh
new file mode 100644
index 00000000000..cdc004ce044
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfdata.hh
@@ -0,0 +1,239 @@
+// -*- related-file-name: "../../libefont/otfdata.cc" -*-
+#ifndef EFONT_OTFDATA_HH
+#define EFONT_OTFDATA_HH
+#include <lcdf/string.hh>
+#include <lcdf/vector.hh>
+#include <lcdf/inttypes.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if NEED_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+#if HAVE_BYTEORDER_H
+# include <byteorder.h>
+#elif HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#elif HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#elif !defined(WIN32)
+# error "configury disaster! Report this error to ekohler@gmail.com"
+#endif
+#ifdef WIN32
+# ifdef __MSC_VER
+# pragma warning (disable: 4290)
+# endif
+# include <winsock2.h>
+#endif
+class ErrorHandler;
+namespace Efont { namespace OpenType {
+
+#if HAVE_PRECONDITION_CHECKING
+#define efont_precondition(x) assert((x))
+#else
+#define efont_precondition(x)
+#endif
+
+class Error {
+ public:
+ String description;
+ Error() : description(String::make_stable("unspecified error")) { }
+ Error(const String &d) : description(d) { }
+};
+
+class Bounds : public Error {
+ public:
+ Bounds() : Error(String::make_stable("bounds error")) { }
+};
+
+class Format : public Error {
+ public:
+ Format(const String& name) : Error(name + " format error") { }
+ Format(const String& name, const String& type)
+ : Error(name + " " + type + " format error") { }
+};
+
+class BlankTable : public Format {
+ public:
+ BlankTable(const String& name) : Format(name, "blank table") { }
+};
+
+class Data {
+ public:
+ Data() { }
+ Data(const String& str) : _str(str) { _str.align(2); }
+ // default copy constructor
+ // default destructor
+
+ operator const String&() const { return _str; }
+
+ operator bool() const { return _str; }
+ const uint8_t *udata() const { return _str.udata(); }
+ int length() const { return _str.length(); }
+
+ static inline uint16_t u16(const unsigned char* s);
+ static inline uint16_t u16_aligned(const unsigned char* s);
+ static inline int16_t s16(const unsigned char* s);
+ static inline int16_t s16_aligned(const unsigned char* s);
+ static inline uint32_t u32(const unsigned char* s);
+ static inline uint32_t u32_aligned16(const unsigned char* s);
+ static inline uint32_t u32_aligned(const unsigned char* s);
+ static inline int32_t s32(const unsigned char* s);
+ static inline int32_t s32_aligned16(const unsigned char* s);
+ static inline int32_t s32_aligned(const unsigned char* s);
+
+ inline uint8_t operator[](unsigned offset) const throw (Bounds);
+ inline uint16_t u16(unsigned offset) const throw (Bounds);
+ inline int16_t s16(unsigned offset) const throw (Bounds);
+ inline uint32_t u32(unsigned offset) const throw (Bounds);
+ inline int32_t s32(unsigned offset) const throw (Bounds);
+ inline uint8_t operator[](int offset) const throw (Bounds);
+ inline uint16_t u16(int offset) const throw (Bounds);
+ inline int16_t s16(int offset) const throw (Bounds);
+ inline uint32_t u32(int offset) const throw (Bounds);
+ inline int32_t s32(int offset) const throw (Bounds);
+
+ Data subtable(unsigned offset) const throw (Bounds);
+ Data offset_subtable(unsigned offset_offset) const throw (Bounds);
+ inline Data substring(int left, int len = -1) const throw ();
+
+ void align_long() { _str.align(4); }
+
+ private:
+
+ String _str;
+
+};
+
+inline uint8_t Data::operator[](unsigned offset) const throw (Bounds) {
+ if (offset >= static_cast<unsigned>(_str.length()))
+ throw Bounds();
+ else
+ return _str[offset];
+}
+
+inline uint16_t Data::u16(const unsigned char* s) {
+#if __x86__ || __x86_64__ || HAVE_INDIFFERENT_ALIGNMENT
+ return ntohs(*reinterpret_cast<const uint16_t*>(s));
+#else
+ return (s[0] << 8) + s[1];
+#endif
+}
+
+inline uint16_t Data::u16_aligned(const unsigned char* s) {
+ efont_precondition((reinterpret_cast<uintptr_t>(s) & 1) == 0);
+ return ntohs(*reinterpret_cast<const uint16_t*>(s));
+}
+
+inline int16_t Data::s16(const unsigned char* s) {
+#if __x86__ || __x86_64__ || HAVE_INDIFFERENT_ALIGNMENT
+ return ntohs(*reinterpret_cast<const int16_t*>(s));
+#else
+ return (int16_t) ((s[0] << 8) + s[1]);
+#endif
+}
+
+inline int16_t Data::s16_aligned(const unsigned char* s) {
+ efont_precondition((reinterpret_cast<uintptr_t>(s) & 1) == 0);
+ return ntohs(*reinterpret_cast<const int16_t*>(s));
+}
+
+inline uint32_t Data::u32(const unsigned char* s) {
+#if __x86__ || __x86_64__ || HAVE_INDIFFERENT_ALIGNMENT
+ return ntohl(*reinterpret_cast<const uint32_t*>(s));
+#else
+ return (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3];
+#endif
+}
+
+inline uint32_t Data::u32_aligned16(const unsigned char* s) {
+#if __x86__ || __x86_64__ || HAVE_INDIFFERENT_ALIGNMENT
+ return ntohl(*reinterpret_cast<const uint32_t*>(s));
+#else
+ efont_precondition((reinterpret_cast<uintptr_t>(s) & 1) == 0);
+ return (u16_aligned(s) << 16) + u16_aligned(s + 2);
+#endif
+}
+
+inline uint32_t Data::u32_aligned(const unsigned char* s) {
+ efont_precondition((reinterpret_cast<uintptr_t>(s) & 3) == 0);
+ return ntohl(*reinterpret_cast<const uint32_t*>(s));
+}
+
+inline int32_t Data::s32(const unsigned char* s) {
+#if __x86__ || __x86_64__ || HAVE_INDIFFERENT_ALIGNMENT
+ return ntohl(*reinterpret_cast<const int32_t*>(s));
+#else
+ return (int32_t) ((s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3]);
+#endif
+}
+
+inline int32_t Data::s32_aligned16(const unsigned char* s) {
+#if __x86__ || __x86_64__ || HAVE_INDIFFERENT_ALIGNMENT
+ return ntohl(*reinterpret_cast<const int32_t*>(s));
+#else
+ efont_precondition((reinterpret_cast<uintptr_t>(s) & 1) == 0);
+ return (int32_t) ((u16_aligned(s) << 16) + u16_aligned(s + 2));
+#endif
+}
+
+inline int32_t Data::s32_aligned(const unsigned char* s) {
+ efont_precondition((reinterpret_cast<uintptr_t>(s) & 3) == 0);
+ return ntohl(*reinterpret_cast<const int32_t*>(s));
+}
+
+inline uint16_t Data::u16(unsigned offset) const throw (Bounds) {
+ if (offset + 1 >= static_cast<unsigned>(_str.length()) || offset + 1 == 0)
+ throw Bounds();
+ else
+ return u16_aligned(_str.udata() + offset);
+}
+
+inline int16_t Data::s16(unsigned offset) const throw (Bounds) {
+ if (offset + 1 >= static_cast<unsigned>(_str.length()) || offset + 1 == 0)
+ throw Bounds();
+ else
+ return s16_aligned(_str.udata() + offset);
+}
+
+inline uint32_t Data::u32(unsigned offset) const throw (Bounds) {
+ if (offset + 3 >= static_cast<unsigned>(_str.length()) || offset + 3 < 3)
+ throw Bounds();
+ else
+ return u32_aligned16(_str.udata() + offset);
+}
+
+inline int32_t Data::s32(unsigned offset) const throw (Bounds) {
+ if (offset + 3 >= static_cast<unsigned>(_str.length()) || offset + 3 < 3)
+ throw Bounds();
+ else
+ return s32_aligned16(_str.udata() + offset);
+}
+
+inline uint8_t Data::operator[](int offset) const throw (Bounds) {
+ return (*this)[unsigned(offset)];
+}
+
+inline uint16_t Data::u16(int offset) const throw (Bounds) {
+ return u16(unsigned(offset));
+}
+
+inline int16_t Data::s16(int offset) const throw (Bounds) {
+ return s16(unsigned(offset));
+}
+
+inline uint32_t Data::u32(int offset) const throw (Bounds) {
+ return u32(unsigned(offset));
+}
+
+inline int32_t Data::s32(int offset) const throw (Bounds) {
+ return s32(unsigned(offset));
+}
+
+inline Data Data::substring(int left, int len) const throw () {
+ return Data(_str.substring(left, len));
+}
+
+} // namespace Efont::OpenType
+} // namespace Efont
+#endif
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgpos.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgpos.hh
index 84de5a2126b..84de5a2126b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgpos.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgpos.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgsub.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgsub.hh
index 98a2e0f945a..98a2e0f945a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfgsub.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfgsub.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfname.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfname.hh
index c91fc5af95f..42f08e614be 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfname.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfname.hh
@@ -68,60 +68,47 @@ class Name { public:
};
-#define USHORT_AT(d) (ntohs(*reinterpret_cast<const uint16_t *>(d)))
-
-inline int Name::nameid(const namerecord_t &nr)
-{
- return USHORT_AT(reinterpret_cast<const uint8_t *>(&nr) + 6);
+inline int Name::nameid(const namerecord_t &nr) {
+ return Data::u16_aligned(reinterpret_cast<const unsigned char*>(&nr) + 6);
}
-inline int Name::platform(const namerecord_t &nr)
-{
- return USHORT_AT(reinterpret_cast<const uint8_t *>(&nr));
+inline int Name::platform(const namerecord_t &nr) {
+ return Data::u16_aligned(reinterpret_cast<const unsigned char*>(&nr));
}
-inline int Name::encoding(const namerecord_t &nr)
-{
- return USHORT_AT(reinterpret_cast<const uint8_t *>(&nr) + 2);
+inline int Name::encoding(const namerecord_t &nr) {
+ return Data::u16_aligned(reinterpret_cast<const unsigned char*>(&nr) + 2);
}
-inline int Name::language(const namerecord_t &nr)
-{
- return USHORT_AT(reinterpret_cast<const uint8_t *>(&nr) + 4);
+inline int Name::language(const namerecord_t &nr) {
+ return Data::u16_aligned(reinterpret_cast<const unsigned char*>(&nr) + 4);
}
-inline Name::const_iterator Name::begin() const
-{
+inline Name::const_iterator Name::begin() const {
return reinterpret_cast<const_iterator>(_str.udata() + HEADER_SIZE);
}
-inline Name::const_iterator Name::end() const
-{
+inline Name::const_iterator Name::end() const {
if (_error >= 0) {
- int count = USHORT_AT(_str.data() + 2);
+ int count = Data::u16_aligned(_str.udata() + 2);
return reinterpret_cast<const_iterator>(_str.udata() + HEADER_SIZE + NAMEREC_SIZE * count);
} else
return reinterpret_cast<const_iterator>(_str.udata() + HEADER_SIZE);
}
-#undef USHORT_AT
-
inline Name::PlatformPred::PlatformPred(int nid, int p, int e, int l)
- : _nameid(nid), _platform(p), _encoding(e), _language(l)
-{
+ : _nameid(nid), _platform(p), _encoding(e), _language(l) {
}
-inline bool Name::PlatformPred::operator()(const namerecord_t &i) const
-{
+inline bool Name::PlatformPred::operator()(const namerecord_t &i) const {
return (_nameid == nameid(i))
&& (_platform < 0 || _platform == platform(i))
&& (_encoding < 0 || _encoding == encoding(i))
&& (_language < 0 || _language == language(i));
}
-inline bool Name::EnglishPlatformPred::operator()(const namerecord_t &i) const
-{
+inline bool Name::EnglishPlatformPred::operator()(const namerecord_t &i) const {
if (_nameid == nameid(i)) {
int p = platform(i), e = encoding(i), l = language(i);
return (p == P_MACINTOSH && e == E_MAC_ROMAN && l == 0)
@@ -130,5 +117,6 @@ inline bool Name::EnglishPlatformPred::operator()(const namerecord_t &i) const
return false;
}
-}}
+} // namespace Efont::OpenType
+} // namespace Efont
#endif
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfos2.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfos2.hh
index db26b674522..db26b674522 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfos2.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfos2.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfpost.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfpost.hh
index 58651583fcb..58651583fcb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/otfpost.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/otfpost.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/pairop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/pairop.hh
index bbb42073e44..bbb42073e44 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/pairop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/pairop.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/psres.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/psres.hh
index ee302821fdb..ee302821fdb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/psres.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/psres.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1bounds.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1bounds.hh
index c5e50634f4c..c5e50634f4c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1bounds.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1bounds.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1cs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1cs.hh
index 1a3f8e8f039..1a3f8e8f039 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1cs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1cs.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1csgen.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1csgen.hh
index 226497a4a6b..226497a4a6b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1csgen.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1csgen.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1font.hh
index 4ec827e7e24..4ec827e7e24 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1font.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1interp.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1interp.hh
index 0b693b08c70..0b693b08c70 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1interp.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1interp.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1item.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1item.hh
index 056ba0e71d4..056ba0e71d4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1item.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1item.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1mm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1mm.hh
index bf2e81a00e9..bf2e81a00e9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1mm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1mm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1rw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1rw.hh
index d59f4089742..d59f4089742 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1rw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1rw.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1unparser.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1unparser.hh
index 3a6e446e3c7..3a6e446e3c7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/t1unparser.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/t1unparser.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfcs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfcs.hh
index a2c04461872..a2c04461872 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfcs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfcs.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfhead.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfhead.hh
index 2611a405b1b..2611a405b1b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfhead.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfhead.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfkern.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfkern.hh
index 717a72b6912..717a72b6912 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/efont/ttfkern.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/efont/ttfkern.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/bezier.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/bezier.hh
index ebb93ce9aea..ebb93ce9aea 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/bezier.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/bezier.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/clp.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/clp.h
index 1b658a17190..1b658a17190 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/clp.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/clp.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/error.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/error.hh
index f43d5d7157e..2af4a77763d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/error.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/error.hh
@@ -119,7 +119,7 @@ class ErrorHandler { public:
/** @brief Construct an ErrorHandler. */
ErrorHandler()
- : _nerrors(0), _nwarnings(0) {
+ : _nerrors(0) {
}
virtual ~ErrorHandler() {
@@ -277,24 +277,11 @@ class ErrorHandler { public:
* assert(errh1.nerrors() == 1);
* @endcode
*
- * @sa nwarnings, reset_counts */
+ * @sa account, clear */
int nerrors() const {
return _nerrors;
}
- /** @brief Return the number of warnings reported via this handler.
- *
- * A warning is any message that contains at least one line with error
- * level 4 (#el_warning), and no line with a lower level. */
- int nwarnings() const {
- return _nwarnings;
- }
-
- /** @brief Reset the nwarnings() and nerrors() counts to zero. */
- void reset_counts() {
- _nwarnings = _nerrors = 0;
- }
-
/** @brief Format an error string.
* @param default_flags default ConversionFlags
@@ -337,8 +324,8 @@ class ErrorHandler { public:
* <tt>\%g</tt>, <tt>\%G</tt></td><td>Format a <tt>double</tt> (user-level
* only).</td></tr>
*
- * <tr><td><tt>\%{...}</tt><td>Call a user-provided conversion function.
- * For example, <tt>\%{ip_ptr}</tt> reads an <tt>IPAddress *</tt> argument
+ * <tr><td><tt>\%p{...}</tt><td>Call a user-provided conversion function.
+ * For example, <tt>\%p{ip_ptr}</tt> reads an <tt>IPAddress *</tt> argument
* from the argument list, and formats the pointed-to address using
* IPAddress::unparse().</td></tr>
*
@@ -440,14 +427,19 @@ class ErrorHandler { public:
* After calling emit() for the lines of an error message, ErrorHandler
* calls account(), passing the minimum (worst) error level of any message
* line (or 1000 if no line had a level). The default implementation
- * updates the nwarnings() and nerrors() counts. Some other ErrorHandlers
+ * updates the nerrors() counter. Some other ErrorHandlers
* add account() behavior that, for example, exits after printing messages
* at el_fatal level or below. */
virtual void account(int level) {
if (level <= el_error)
++_nerrors;
- else if (level == el_warning)
- ++_nwarnings;
+ }
+
+ /** @brief Clear accumulated error state.
+ *
+ * The default implementation sets the nerrors() counter to zero. */
+ virtual void clear() {
+ _nerrors = 0;
}
@@ -583,7 +575,6 @@ class ErrorHandler { public:
private:
int _nerrors;
- int _nwarnings;
static ErrorHandler *the_default_handler;
static ErrorHandler *the_silent_handler;
@@ -617,7 +608,8 @@ class SilentErrorHandler : public ErrorHandler { public:
* printing. The ErrorVeneer base class simplifies the implementation of
* stacking ErrorHandlers. It provides versions of ErrorHandler's format(),
* decorate(), emit(), and account() methods that forward to the underlying
- * handler. */
+ * handler. Note that the clear() method is <em>not</em> automatically
+ * forwarded. */
class ErrorVeneer : public ErrorHandler { public:
/** @brief Construct an ErrorVeneer.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/filename.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/filename.hh
index 9424a4c04fa..9424a4c04fa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/filename.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/filename.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/globmatch.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/globmatch.hh
index 963035e0ead..963035e0ead 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/globmatch.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/globmatch.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashcode.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashcode.hh
index 53a0e428989..53a0e428989 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashcode.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashcode.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.cc
index 4851463c560..4851463c560 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.hh
index 3d4179e5b5f..3d4179e5b5f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/hashmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/hashmap.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/inttypes.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/inttypes.h
index b88e9e9faf0..b88e9e9faf0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/inttypes.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/inttypes.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/landmark.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/landmark.hh
index 183ab936ee8..183ab936ee8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/landmark.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/landmark.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/md5.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/md5.h
index 7d7f8641d23..7d7f8641d23 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/md5.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/md5.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/permstr.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/permstr.hh
index 684878ed464..684878ed464 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/permstr.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/permstr.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/point.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/point.hh
index aad59b53ccf..aad59b53ccf 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/point.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/point.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/slurper.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/slurper.hh
index 2e400d3c3f2..2e400d3c3f2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/slurper.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/slurper.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/straccum.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/straccum.hh
index 9474421e85f..f62c2984978 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/straccum.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/straccum.hh
@@ -80,6 +80,14 @@ class StringAccum { public:
return reinterpret_cast<char *>(_s);
}
+ inline const unsigned char* udata() const {
+ return _s;
+ }
+
+ inline unsigned char* udata() {
+ return _s;
+ }
+
/** @brief Return true iff the StringAccum is empty or out-of-memory. */
bool empty() const {
return _len == 0;
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/string.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/string.hh
index d3ca5e87bd2..ad83d7cb496 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/string.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/string.hh
@@ -367,6 +367,12 @@ class String { public:
return String();
}
+ /** @overload */
+ inline String substring(const unsigned char* first, const unsigned char* last) const {
+ return substring(reinterpret_cast<const char*>(first),
+ reinterpret_cast<const char*>(last));
+ }
+
/** @brief Return a substring of this string, consisting of the @a len
* characters starting at index @a pos.
* @param pos substring's first position relative to the string
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/strtonum.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/strtonum.h
index ee8745a4a42..ee8745a4a42 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/strtonum.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/strtonum.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/transform.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/transform.hh
index 496658a4911..496658a4911 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/transform.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/transform.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.cc
index 8ad11c18810..8ad11c18810 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.hh
index 86e64e238ba..86e64e238ba 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/include/lcdf/vector.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/include/lcdf/vector.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/lcdf-typetools.spec
index 0dd5719fddc..f8f235104f1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/lcdf-typetools.spec
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/lcdf-typetools.spec
@@ -1,6 +1,6 @@
Summary: Programs to manipulate OpenType and multiple-master fonts
Name: lcdf-typetools
-Version: 2.97
+Version: 2.98
Copyright: GPL
Vendor: Little Cambridgeport Design Factory <http://www.lcdf.org/>
Group: Utilities/Printing
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.am
index eb09a9686ad..eb09a9686ad 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.in
index e89eb6cfd79..613540197f9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/Makefile.in
@@ -50,7 +50,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = lcdf-typetools-2.97/libefont
+subdir = lcdf-typetools-2.98/libefont
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -341,9 +341,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/libefont/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/libefont/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/libefont/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/libefont/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afm.cc
index 9705f91c97f..9705f91c97f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmparse.cc
index 313b63ec362..313b63ec362 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmparse.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmparse.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmw.cc
index 20840be1332..20840be1332 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/afmw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/afmw.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/amfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/amfm.cc
index b38532d55fb..b38532d55fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/amfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/amfm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/cff.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/cff.cc
index 822d57ec94d..822d57ec94d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/cff.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/cff.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/encoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/encoding.cc
index a55ecc4db25..a55ecc4db25 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/encoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/encoding.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/findmet.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/findmet.cc
index aa5b8167156..aa5b8167156 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/findmet.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/findmet.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/metrics.cc
index 0dd308056e2..0dd308056e2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/metrics.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otf.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otf.cc
index fb0abe3806a..187dd10dd92 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otf.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otf.cc
@@ -30,17 +30,12 @@
#define static_assert(c) switch (c) case 0: case (c):
#endif
-#define USHORT_AT(d) (ntohs(*(const uint16_t *)(d)))
-#define ULONG_AT(d) (ntohl(*(const uint32_t *)(d)))
-#define ULONG_AT2(d) ((USHORT_AT((d)) << 16) | USHORT_AT((d)+2))
-
namespace Efont { namespace OpenType {
Vector<PermString> debug_glyph_names;
Font::Font(const String &s, ErrorHandler *errh)
- : _str(s)
-{
+ : _str(s) {
_str.align(4);
_error = parse_header(errh ? errh : ErrorHandler::silent_handler());
}
@@ -61,7 +56,7 @@ Font::parse_header(ErrorHandler *errh)
if ((data[0] != 'O' || data[1] != 'T' || data[2] != 'T' || data[3] != 'O')
&& (data[0] != '\000' || data[1] != '\001'))
return errh->error("not an OpenType font (bad magic number)"), -ERANGE;
- int ntables = USHORT_AT(data + 4);
+ int ntables = Data::u16_aligned(data + 4);
if (ntables == 0)
return errh->error("OTF contains no tables"), -EINVAL;
if (HEADER_SIZE + TABLE_DIR_ENTRY_SIZE * ntables > len)
@@ -75,9 +70,9 @@ Font::parse_header(ErrorHandler *errh)
uint32_t last_tag = 0U;
for (int i = 0; i < ntables; i++) {
int loc = HEADER_SIZE + TABLE_DIR_ENTRY_SIZE * i;
- uint32_t tag = ULONG_AT(data + loc);
- uint32_t offset = ULONG_AT(data + loc + 8);
- uint32_t length = ULONG_AT(data + loc + 12);
+ uint32_t tag = Data::u32_aligned(data + loc);
+ uint32_t offset = Data::u32_aligned(data + loc + 8);
+ uint32_t length = Data::u32_aligned(data + loc + 12);
if (tag <= last_tag)
return errh->error("tags out of order"), -EINVAL;
if (offset + length > (uint32_t) len)
@@ -97,14 +92,15 @@ Font::check_checksums(ErrorHandler *errh) const
bool ok = true;
for (int i = 0; i < nt; i++) {
const uint8_t *entry = data() + HEADER_SIZE + TABLE_DIR_ENTRY_SIZE * i;
- String tbl = _str.substring(ULONG_AT(entry + 8), ULONG_AT(entry + 12));
+ String tbl = _str.substring(Data::u32_aligned(entry + 8),
+ Data::u32_aligned(entry + 12));
uint32_t sum = checksum(tbl);
- if (ULONG_AT(entry) == 0x68656164 // 'head'
+ if (Data::u32_aligned(entry) == 0x68656164 // 'head'
&& tbl.length() >= 12)
- sum -= ULONG_AT(tbl.data() + 8);
- if (sum != ULONG_AT(entry + 4)) {
+ sum -= Data::u32_aligned(tbl.udata() + 8);
+ if (sum != Data::u32_aligned(entry + 4)) {
if (errh)
- errh->error("table '%s' checksum error: %x vs. %x", Tag(ULONG_AT(entry)).text().c_str(), sum, ULONG_AT(entry + 4));
+ errh->error("table %<%s%> checksum error: %x vs. %x", Tag(Data::u32_aligned(entry)).text().c_str(), sum, Data::u32_aligned(entry + 4));
ok = false;
}
}
@@ -117,7 +113,7 @@ Font::ntables() const
if (error() < 0)
return 0;
else
- return USHORT_AT(data() + 4);
+ return Data::u16_aligned(data() + 4);
}
String
@@ -125,9 +121,9 @@ Font::table(Tag tag) const
{
if (error() < 0)
return String();
- const uint8_t *entry = tag.table_entry(data() + HEADER_SIZE, USHORT_AT(data() + 4), TABLE_DIR_ENTRY_SIZE);
+ const uint8_t *entry = tag.table_entry(data() + HEADER_SIZE, Data::u16_aligned(data() + 4), TABLE_DIR_ENTRY_SIZE);
if (entry)
- return _str.substring(ULONG_AT(entry + 8), ULONG_AT(entry + 12));
+ return _str.substring(Data::u32_aligned(entry + 8), Data::u32_aligned(entry + 12));
else
return String();
}
@@ -137,7 +133,7 @@ Font::has_table(Tag tag) const
{
const uint8_t *entry = 0;
if (error() >= 0)
- entry = tag.table_entry(data() + HEADER_SIZE, USHORT_AT(data() + 4), TABLE_DIR_ENTRY_SIZE);
+ entry = tag.table_entry(data() + HEADER_SIZE, Data::u16_aligned(data() + 4), TABLE_DIR_ENTRY_SIZE);
return entry != 0;
}
@@ -146,9 +142,9 @@ Font::table_checksum(Tag tag) const
{
if (error() < 0)
return 0;
- const uint8_t *entry = tag.table_entry(data() + HEADER_SIZE, USHORT_AT(data() + 4), TABLE_DIR_ENTRY_SIZE);
+ const uint8_t *entry = tag.table_entry(data() + HEADER_SIZE, Data::u16_aligned(data() + 4), TABLE_DIR_ENTRY_SIZE);
if (entry)
- return ULONG_AT(entry + 4);
+ return Data::u32_aligned(entry + 4);
else
return 0;
}
@@ -159,7 +155,7 @@ Font::table_tag(int i) const
if (error() < 0 || i < 0 || i >= ntables())
return Tag();
else
- return Tag(ULONG_AT(data() + HEADER_SIZE + TABLE_DIR_ENTRY_SIZE * i));
+ return Tag(Data::u32_aligned(data() + HEADER_SIZE + TABLE_DIR_ENTRY_SIZE * i));
}
uint32_t
@@ -168,10 +164,10 @@ Font::checksum(const uint8_t *begin, const uint8_t *end)
uint32_t sum = 0;
if (reinterpret_cast<uintptr_t>(begin) % 4)
for (; begin + 3 < end; begin += 4)
- sum += (begin[0] << 24) + (begin[1] << 16) + (begin[2] << 8) + begin[3];
+ sum += Data::u32(begin);
else
for (; begin + 3 < end; begin += 4)
- sum += ULONG_AT(begin);
+ sum += Data::u32_aligned(begin);
uint32_t leftover = 0;
for (int i = 0; i < 4; i++)
leftover = (leftover << 8) + (begin < end ? *begin++ : 0);
@@ -232,10 +228,8 @@ Font::make(bool truetype, const Vector<Tag>& tags, const Vector<String>& data)
// discount current checksum adjustment in head table
uint32_t sum = checksum(data[*tp]);
- if (tags[*tp] == Tag("head") && data[*tp].length() >= 12) {
- const uint8_t *x = data[*tp].udata() + 8;
- sum -= (x[0] << 24) + (x[1] << 16) + (x[2] << 8) + x[3];
- }
+ if (tags[*tp] == Tag("head") && data[*tp].length() >= 12)
+ sum -= Data::u32(data[*tp].udata() + 8);
tdir.l[1] = htonl(sum);
tdir.l[2] = htonl(offset);
@@ -253,9 +247,9 @@ Font::make(bool truetype, const Vector<Tag>& tags, const Vector<String>& data)
// fix 'head' table
for (int i = 0; i < tags.size(); i++) {
- char *thdr = sa.data() + HEADER_SIZE + TABLE_DIR_ENTRY_SIZE * i;
- if (ULONG_AT(thdr) == 0x68656164 && ULONG_AT(thdr + 12) >= 12) {
- uint32_t offset = ULONG_AT(thdr + 8);
+ unsigned char *thdr = sa.udata() + HEADER_SIZE + TABLE_DIR_ENTRY_SIZE * i;
+ if (Data::u32(thdr) == 0x68656164 && Data::u32(thdr + 12) >= 12) {
+ uint32_t offset = Data::u32(thdr + 8);
char *head = sa.data() + offset;
memset(head + 8, '\0', 4);
uint32_t allsum = checksum(reinterpret_cast<uint8_t *>(sa.data()), reinterpret_cast<uint8_t *>(sa.data() + sa.length()));
@@ -349,7 +343,7 @@ Tag::table_entry(const uint8_t *table, int n, int entry_size) const
while (l < r) {
int m = l + (r - l) / 2;
const uint8_t *entry = table + m * entry_size;
- uint32_t m_tag = ULONG_AT2(entry);
+ uint32_t m_tag = Data::u32_aligned16(entry);
if (_tag < m_tag)
r = m;
else if (_tag == m_tag)
@@ -386,7 +380,7 @@ ScriptList::check_header(ErrorHandler *errh)
// 6bytes scriptRecord[]
int scriptCount;
if (_str.length() < SCRIPTLIST_HEADERSIZE
- || (scriptCount = USHORT_AT(_str.udata()),
+ || (scriptCount = Data::u16_aligned(_str.udata()),
_str.length() < SCRIPTLIST_HEADERSIZE + scriptCount*SCRIPT_RECSIZE))
return errh->error("OTF ScriptList too short");
@@ -401,8 +395,8 @@ ScriptList::script_offset(Tag script) const
if (_str.length() == 0)
return -1;
const uint8_t *data = _str.udata();
- if (const uint8_t *entry = script.table_entry(data + SCRIPTLIST_HEADERSIZE, USHORT_AT(data), SCRIPT_RECSIZE))
- return USHORT_AT(entry + 4);
+ if (const uint8_t *entry = script.table_entry(data + SCRIPTLIST_HEADERSIZE, Data::u16_aligned(data), SCRIPT_RECSIZE))
+ return Data::u16_aligned(entry + 4);
else
return 0;
}
@@ -413,9 +407,9 @@ ScriptList::check_script(Tag tag, int script_off, ErrorHandler *errh) const
const uint8_t *data = _str.udata();
int langSysCount;
if (_str.length() < script_off + SCRIPT_HEADERSIZE
- || (langSysCount = USHORT_AT(data + script_off + 2),
+ || (langSysCount = Data::u16_aligned(data + script_off + 2),
(_str.length() < script_off + SCRIPT_HEADERSIZE + langSysCount*LANGSYS_RECSIZE)))
- return (errh ? errh->error("OTF Script table for '%s' out of range", tag.text().c_str()) : -1);
+ return (errh ? errh->error("OTF Script table for %<%s%> out of range", tag.text().c_str()) : -1);
// XXX check that langsys are sorted
return 0;
}
@@ -437,12 +431,12 @@ ScriptList::langsys_offset(Tag script, Tag langsys, ErrorHandler *errh) const
// search script table
const uint8_t *data = _str.udata();
- int langSysCount = USHORT_AT(data + script_off + 2);
+ int langSysCount = Data::u16_aligned(data + script_off + 2);
if (const uint8_t *entry = langsys.table_entry(data + script_off + SCRIPT_HEADERSIZE, langSysCount, LANGSYS_RECSIZE))
- return script_off + USHORT_AT(entry + 4);
+ return script_off + Data::u16_aligned(entry + 4);
// return default
- int defaultLangSys = USHORT_AT(data + script_off);
+ int defaultLangSys = Data::u16_aligned(data + script_off);
if (defaultLangSys != 0)
return script_off + defaultLangSys;
else
@@ -456,18 +450,18 @@ ScriptList::language_systems(Vector<Tag> &script, Vector<Tag> &langsys, ErrorHan
langsys.clear();
const uint8_t *data = _str.udata();
- int nscripts = USHORT_AT(data);
+ int nscripts = Data::u16_aligned(data);
for (int i = 0; i < nscripts; i++) {
- Tag script_tag(ULONG_AT2(data + SCRIPTLIST_HEADERSIZE + i*SCRIPT_RECSIZE));
- int script_off = USHORT_AT(data + SCRIPTLIST_HEADERSIZE + i*SCRIPT_RECSIZE + 4);
+ Tag script_tag(Data::u32_aligned16(data + SCRIPTLIST_HEADERSIZE + i*SCRIPT_RECSIZE));
+ int script_off = Data::u16_aligned(data + SCRIPTLIST_HEADERSIZE + i*SCRIPT_RECSIZE + 4);
if (check_script(script_tag, script_off, errh) < 0)
return -1;
const uint8_t *script_table = data + script_off;
- if (USHORT_AT(script_table) != 0) // default LangSys
+ if (Data::u16_aligned(script_table) != 0) // default LangSys
script.push_back(script_tag), langsys.push_back(Tag());
- int nlangsys = USHORT_AT(script_table + 2);
+ int nlangsys = Data::u16_aligned(script_table + 2);
for (int j = 0; j < nlangsys; j++) {
- Tag langsys_tag(ULONG_AT2(script_table + SCRIPT_HEADERSIZE + j*LANGSYS_RECSIZE));
+ Tag langsys_tag(Data::u32_aligned16(script_table + SCRIPT_HEADERSIZE + j*LANGSYS_RECSIZE));
script.push_back(script_tag), langsys.push_back(langsys_tag);
}
}
@@ -490,17 +484,17 @@ ScriptList::features(Tag script, Tag langsys, int &required_fid, Vector<int> &fi
const uint8_t *data = _str.udata();
int featureCount;
if (_str.length() < offset + LANGSYS_HEADERSIZE
- || (featureCount = USHORT_AT(data + offset + 4),
+ || (featureCount = Data::u16_aligned(data + offset + 4),
(_str.length() < offset + LANGSYS_HEADERSIZE + featureCount*FEATURE_RECSIZE)))
return (errh ? errh->error("OTF LangSys table for '%s/%s' out of range", script.text().c_str(), langsys.text().c_str()) : -1);
// search langsys table
- int f = USHORT_AT(data + offset + 2);
+ int f = Data::u16_aligned(data + offset + 2);
if (f != 0xFFFF)
required_fid = f;
data += offset + 6;
for (int i = 0; i < featureCount; i++, data += FEATURE_RECSIZE)
- fids.push_back(USHORT_AT(data));
+ fids.push_back(Data::u16_aligned(data));
return 0;
}
@@ -528,7 +522,7 @@ FeatureList::check_header(ErrorHandler *errh)
{
int featureCount;
if (_str.length() < FEATURELIST_HEADERSIZE
- || (featureCount = USHORT_AT(_str.udata()),
+ || (featureCount = Data::u16_aligned(_str.udata()),
_str.length() < FEATURELIST_HEADERSIZE + featureCount*FEATURE_RECSIZE))
return errh->error("OTF FeatureList too short");
return 0;
@@ -540,9 +534,9 @@ FeatureList::tag(int fid) const
if (_str.length() == 0)
return Tag();
const uint8_t *data = _str.udata();
- int nfeatures = USHORT_AT(data);
+ int nfeatures = Data::u16_aligned(data);
if (fid >= 0 && fid < nfeatures)
- return Tag(ULONG_AT2(data + FEATURELIST_HEADERSIZE + fid*FEATURE_RECSIZE));
+ return Tag(Data::u32_aligned16(data + FEATURELIST_HEADERSIZE + fid*FEATURE_RECSIZE));
else
return Tag();
}
@@ -557,13 +551,13 @@ FeatureList::params(int fid, int length, ErrorHandler *errh, bool old_style_offs
const uint8_t *data = _str.udata();
int len = _str.length();
- int nfeatures = USHORT_AT(data);
+ int nfeatures = Data::u16_aligned(data);
if (fid < 0 || fid >= nfeatures)
return errh->error("OTF feature ID '%d' out of range", fid), String();
- int foff = USHORT_AT(data + FEATURELIST_HEADERSIZE + fid*FEATURE_RECSIZE + 4);
+ int foff = Data::u16_aligned(data + FEATURELIST_HEADERSIZE + fid*FEATURE_RECSIZE + 4);
if (len < foff + FEATURE_HEADERSIZE)
return errh->error("OTF LookupList for feature ID '%d' too short", fid), String();
- int poff = USHORT_AT(data + foff);
+ int poff = Data::u16_aligned(data + foff);
if (poff == 0)
return String();
if (!old_style_offset)
@@ -581,25 +575,25 @@ 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
+ // errh->message("trying %d %d %d %d %d\n", Data::u16_aligned(data), Data::u16_aligned(data + 2), Data::u16_aligned(data + 4), Data::u16_aligned(data + 6), Data::u16_aligned(data + 8));
+ if (Data::u16_aligned(data) == 0) // design size == 0
continue;
- if (USHORT_AT(data + 2) == 0 // subfamily ID == 0
- && USHORT_AT(data + 6) == 0 // range start == 0
- && USHORT_AT(data + 8) == 0 // range end == 0
- && USHORT_AT(data + 4) == 0) // menu name ID == 0
+ if (Data::u16_aligned(data + 2) == 0 // subfamily ID == 0
+ && Data::u16_aligned(data + 6) == 0 // range start == 0
+ && Data::u16_aligned(data + 8) == 0 // range end == 0
+ && Data::u16_aligned(data + 4) == 0) // menu name ID == 0
return s;
- 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
+ if (Data::u16_aligned(data + 6) >= Data::u16_aligned(data + 8) // range start >= range end
+ || Data::u16_aligned(data + 4) < 256 // menu name ID < 256
+ || Data::u16_aligned(data + 4) > 32767 // menu name ID > 32767
+ || !name.english_name(Data::u16_aligned(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)
+ if (Data::u16_aligned(data) + 1 >= Data::u16_aligned(data + 6) // design size >= range start (with 1 dp grace)
+ && Data::u16_aligned(data) <= Data::u16_aligned(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
+ && Data::u16_aligned(data + 8) <= 1440 // range end <= 144 point
+ && Data::u16_aligned(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)
@@ -619,10 +613,10 @@ FeatureList::find(Tag tag, const Vector<int> &fids) const
return -1;
const uint8_t *data = _str.udata();
- int nfeatures = USHORT_AT(data);
+ int nfeatures = Data::u16_aligned(data);
for (const int *fidp = fids.begin(); fidp != fids.end(); fidp++)
if (*fidp >= 0 && *fidp < nfeatures) {
- uint32_t ftag = ULONG_AT2(data + FEATURELIST_HEADERSIZE + (*fidp)*FEATURE_RECSIZE);
+ uint32_t ftag = Data::u32_aligned16(data + FEATURELIST_HEADERSIZE + (*fidp)*FEATURE_RECSIZE);
if (ftag == tag.value())
return *fidp;
}
@@ -645,9 +639,9 @@ FeatureList::filter(Vector<int> &fids, const Vector<Tag> &sorted_ftags) const
// XXX check that feature list is in alphabetical order
const uint8_t *data = _str.udata();
- int nfeatures = USHORT_AT(data);
+ int nfeatures = Data::u16_aligned(data);
while (i < fids.size() && j < sorted_ftags.size() && fids[i] < nfeatures) {
- uint32_t ftag = ULONG_AT2(data + FEATURELIST_HEADERSIZE + fids[i]*FEATURE_RECSIZE);
+ uint32_t ftag = Data::u32_aligned16(data + FEATURELIST_HEADERSIZE + fids[i]*FEATURE_RECSIZE);
if (ftag < sorted_ftags[j].value()) { // not an interesting feature
// replace featureID with a large number, remove later
fids[i] = 0x7FFFFFFF;
@@ -677,18 +671,18 @@ FeatureList::lookups(int fid, Vector<int> &results, ErrorHandler *errh, bool cle
const uint8_t *data = _str.udata();
int len = _str.length();
- int nfeatures = USHORT_AT(data);
+ int nfeatures = Data::u16_aligned(data);
if (fid < 0 || fid >= nfeatures)
return errh->error("OTF feature ID '%d' out of range", fid);
- int foff = USHORT_AT(data + FEATURELIST_HEADERSIZE + fid*FEATURE_RECSIZE + 4);
+ int foff = Data::u16_aligned(data + FEATURELIST_HEADERSIZE + fid*FEATURE_RECSIZE + 4);
int lookupCount;
if (len < foff + FEATURE_HEADERSIZE
- || (lookupCount = USHORT_AT(data + foff + 2),
+ || (lookupCount = Data::u16_aligned(data + foff + 2),
len < foff + FEATURE_HEADERSIZE + lookupCount*LOOKUPLIST_RECSIZE))
return errh->error("OTF LookupList for feature ID '%d' too short", fid);
const uint8_t *ldata = data + foff + FEATURE_HEADERSIZE;
for (int j = 0; j < lookupCount; j++, ldata += LOOKUPLIST_RECSIZE)
- results.push_back(USHORT_AT(ldata));
+ results.push_back(Data::u16_aligned(ldata));
return 0;
}
@@ -804,7 +798,7 @@ Coverage::Coverage(const String &str, ErrorHandler *errh, bool do_check) throw (
_str = String();
} else { // check()'s shorten-string side effect
const uint8_t *data = _str.udata();
- int count = USHORT_AT(data + 2);
+ int count = Data::u16_aligned(data + 2);
if (data[1] == T_LIST)
_str = _str.substring(0, HEADERSIZE + count*LIST_RECSIZE);
else
@@ -822,8 +816,8 @@ Coverage::check(ErrorHandler *errh)
const uint8_t *data = _str.udata();
if (_str.length() < HEADERSIZE)
return errh->error("OTF coverage table too small for header");
- int coverageFormat = USHORT_AT(data);
- int count = USHORT_AT(data + 2);
+ int coverageFormat = Data::u16_aligned(data);
+ int count = Data::u16_aligned(data + 2);
int len;
switch (coverageFormat) {
@@ -858,9 +852,9 @@ Coverage::size() const throw ()
return (_str.length() - HEADERSIZE) / LIST_RECSIZE;
else if (data[1] == T_RANGES) {
data += _str.length() - RANGES_RECSIZE;
- return USHORT_AT(data + 4) + USHORT_AT(data + 2) - USHORT_AT(data) + 1;
+ return Data::u16_aligned(data + 4) + Data::u16_aligned(data + 2) - Data::u16_aligned(data) + 1;
} else if (data[1] == T_X_BYTEMAP)
- return ULONG_AT(data + 4);
+ return Data::u32_aligned(data + 4);
else
return -1;
}
@@ -872,13 +866,13 @@ Coverage::coverage_index(Glyph g) const throw ()
return -1;
const uint8_t *data = _str.udata();
- int count = USHORT_AT(data + 2);
+ int count = Data::u16_aligned(data + 2);
if (data[1] == T_LIST) {
int l = 0, r = count;
data += HEADERSIZE;
while (l < r) {
int m = l + (r - l) / 2;
- int mval = USHORT_AT(data + m * LIST_RECSIZE);
+ int mval = Data::u16_aligned(data + m * LIST_RECSIZE);
if (g < mval)
r = m;
else if (g == mval)
@@ -893,10 +887,10 @@ Coverage::coverage_index(Glyph g) const throw ()
while (l < r) {
int m = l + (r - l) / 2;
const uint8_t *rec = data + m * RANGES_RECSIZE;
- if (g < USHORT_AT(rec))
+ if (g < Data::u16_aligned(rec))
r = m;
- else if (g <= USHORT_AT(rec + 2))
- return USHORT_AT(rec + 4) + g - USHORT_AT(rec);
+ else if (g <= Data::u16_aligned(rec + 2))
+ return Data::u16_aligned(rec + 4) + g - Data::u16_aligned(rec);
else
l = m + 1;
}
@@ -917,20 +911,20 @@ Coverage::operator[](int cindex) const throw ()
return 0;
const uint8_t *data = _str.udata();
- int count = USHORT_AT(data + 2);
+ int count = Data::u16_aligned(data + 2);
if (data[1] == T_LIST)
- return (cindex < count ? USHORT_AT(data + cindex * LIST_RECSIZE) : 0);
+ return (cindex < count ? Data::u16_aligned(data + cindex * LIST_RECSIZE) : 0);
else if (data[1] == T_RANGES) {
int l = 0, r = count;
data += HEADERSIZE;
while (l < r) {
int m = l + (r - l) / 2;
const uint8_t *rec = data + m * RANGES_RECSIZE;
- int start_cindex = USHORT_AT(rec + 4);
+ int start_cindex = Data::u16_aligned(rec + 4);
if (cindex < start_cindex)
r = m;
- else if (cindex < start_cindex + USHORT_AT(rec + 2) - USHORT_AT(rec))
- return USHORT_AT(rec) + cindex - start_cindex;
+ else if (cindex < start_cindex + Data::u16_aligned(rec + 2) - Data::u16_aligned(rec))
+ return Data::u16_aligned(rec) + cindex - start_cindex;
else
l = m + 1;
}
@@ -946,15 +940,15 @@ Coverage::unparse(StringAccum &sa) const throw ()
if (_str.length() == 0)
sa << "@*#!";
else if (data[1] == T_LIST) {
- int count = USHORT_AT(data + 2);
+ int count = Data::u16_aligned(data + 2);
for (int i = 0; i < count; i++) {
if (i) sa << ',';
- sa << USHORT_AT(data + HEADERSIZE + i*LIST_RECSIZE);
+ sa << Data::u16_aligned(data + HEADERSIZE + i*LIST_RECSIZE);
}
} else {
for (int pos = HEADERSIZE; pos < _str.length(); pos += RANGES_RECSIZE) {
- Glyph start = USHORT_AT(data + pos);
- Glyph end = USHORT_AT(data + pos + 2);
+ Glyph start = Data::u16_aligned(data + pos);
+ Glyph end = Data::u16_aligned(data + pos + 2);
if (pos > HEADERSIZE) sa << ',';
sa << start;
if (end != start) sa << '.' << '.' << end;
@@ -1032,13 +1026,13 @@ Coverage::iterator::iterator(const String &str, bool is_end)
// shrink _str to fit the coverage table
const uint8_t *data = _str.udata();
- int n = USHORT_AT(data + 2);
- switch (USHORT_AT(data)) {
+ int n = Data::u16_aligned(data + 2);
+ switch (Data::u16_aligned(data)) {
case T_LIST:
_str = _str.substring(0, HEADERSIZE + n*LIST_RECSIZE);
normal_pos_setting:
_pos = is_end ? _str.length() : HEADERSIZE;
- _value = _pos >= _str.length() ? 0 : USHORT_AT(data + _pos);
+ _value = _pos >= _str.length() ? 0 : Data::u16_aligned(data + _pos);
break;
case T_RANGES:
_str = _str.substring(0, HEADERSIZE + n*RANGES_RECSIZE);
@@ -1064,7 +1058,7 @@ Coverage::iterator::coverage_index() const
if (data[1] == T_LIST)
return (_pos - HEADERSIZE) / LIST_RECSIZE;
else if (data[1] == T_RANGES)
- return USHORT_AT(data + _pos + 4) + _value - USHORT_AT(data + _pos);
+ return Data::u16_aligned(data + _pos + 4) + _value - Data::u16_aligned(data + _pos);
else
return _pos - 8;
}
@@ -1075,13 +1069,13 @@ Coverage::iterator::operator++(int)
const uint8_t *data = _str.udata();
int len = _str.length();
if (_pos >= len
- || (data[1] == T_RANGES && ++_value <= USHORT_AT(data + _pos + 2)))
+ || (data[1] == T_RANGES && ++_value <= Data::u16_aligned(data + _pos + 2)))
return;
switch (data[1]) {
case T_LIST:
_pos += LIST_RECSIZE;
normal_pos_setting:
- _value = _pos >= len ? 0 : USHORT_AT(data + _pos);
+ _value = _pos >= len ? 0 : Data::u16_aligned(data + _pos);
break;
case T_RANGES:
_pos += RANGES_RECSIZE;
@@ -1110,8 +1104,8 @@ Coverage::iterator::forward_to(Glyph find)
_pos += LIST_RECSIZE;
if (_pos >= _str.length())
return false;
- else if (find <= USHORT_AT(data + _pos)) {
- _value = USHORT_AT(data + _pos);
+ else if (find <= Data::u16_aligned(data + _pos)) {
+ _value = Data::u16_aligned(data + _pos);
return find == _value;
}
@@ -1121,7 +1115,7 @@ Coverage::iterator::forward_to(Glyph find)
data += HEADERSIZE;
while (l < r) {
int m = l + (r - l) / 2;
- Glyph g = USHORT_AT(data + m * LIST_RECSIZE);
+ Glyph g = Data::u16_aligned(data + m * LIST_RECSIZE);
if (find < g)
r = m;
else if (find == g)
@@ -1130,20 +1124,20 @@ Coverage::iterator::forward_to(Glyph find)
l = m + 1;
}
_pos = HEADERSIZE + l * LIST_RECSIZE;
- _value = (_pos >= _str.length() ? 0 : USHORT_AT(data - HEADERSIZE + _pos));
+ _value = (_pos >= _str.length() ? 0 : Data::u16_aligned(data - HEADERSIZE + _pos));
} else if (data[1] == T_RANGES) {
// check for "common" case: this or next element
- if (find <= USHORT_AT(data + _pos + 2)) {
- assert(find >= USHORT_AT(data + _pos));
+ if (find <= Data::u16_aligned(data + _pos + 2)) {
+ assert(find >= Data::u16_aligned(data + _pos));
_value = find;
return true;
}
_pos += RANGES_RECSIZE;
if (_pos >= _str.length())
return false;
- else if (find <= USHORT_AT(data + _pos + 2)) {
- _value = (find >= USHORT_AT(data + _pos) ? find : USHORT_AT(data + _pos));
+ else if (find <= Data::u16_aligned(data + _pos + 2)) {
+ _value = (find >= Data::u16_aligned(data + _pos) ? find : Data::u16_aligned(data + _pos));
return find == _value;
}
@@ -1153,9 +1147,9 @@ Coverage::iterator::forward_to(Glyph find)
data += HEADERSIZE;
while (l < r) {
int m = l + (r - l) / 2;
- if (find < USHORT_AT(data + m * RANGES_RECSIZE))
+ if (find < Data::u16_aligned(data + m * RANGES_RECSIZE))
r = m;
- else if (find <= USHORT_AT(data + m * RANGES_RECSIZE + 2)) {
+ else if (find <= Data::u16_aligned(data + m * RANGES_RECSIZE + 2)) {
_pos = HEADERSIZE + m * RANGES_RECSIZE;
_value = find;
return true;
@@ -1163,7 +1157,7 @@ Coverage::iterator::forward_to(Glyph find)
l = m + 1;
}
_pos = HEADERSIZE + l * LIST_RECSIZE;
- _value = (_pos >= _str.length() ? 0 : USHORT_AT(data - HEADERSIZE + _pos));
+ _value = (_pos >= _str.length() ? 0 : Data::u16_aligned(data - HEADERSIZE + _pos));
} else if (data[1] == T_X_BYTEMAP) {
_pos = 8 + find;
@@ -1259,15 +1253,15 @@ ClassDef::check(ErrorHandler *errh)
const uint8_t *data = _str.udata();
if (_str.length() < 6) // NB: prevents empty format-2 tables
return errh->error("OTF class def table too small for header");
- int classFormat = USHORT_AT(data);
+ int classFormat = Data::u16_aligned(data);
int len;
if (classFormat == T_LIST) {
- int count = USHORT_AT(data + 4);
+ int count = Data::u16_aligned(data + 4);
len = LIST_HEADERSIZE + count*LIST_RECSIZE;
// XXX don't check sorting
} else if (classFormat == T_RANGES) {
- int count = USHORT_AT(data + 2);
+ int count = Data::u16_aligned(data + 2);
len = RANGES_HEADERSIZE + count*RANGES_RECSIZE;
// XXX don't check sorting
} else
@@ -1288,25 +1282,25 @@ ClassDef::lookup(Glyph g) const throw ()
return -1;
const uint8_t *data = _str.udata();
- int coverageFormat = USHORT_AT(data);
+ int coverageFormat = Data::u16_aligned(data);
if (coverageFormat == T_LIST) {
- Glyph start = USHORT_AT(data + 2);
- int count = USHORT_AT(data + 4);
+ Glyph start = Data::u16_aligned(data + 2);
+ int count = Data::u16_aligned(data + 4);
if (g < start || g >= start + count)
return 0;
else
- return USHORT_AT(data + LIST_HEADERSIZE + (g - start) * LIST_RECSIZE);
+ return Data::u16_aligned(data + LIST_HEADERSIZE + (g - start) * LIST_RECSIZE);
} else if (coverageFormat == T_RANGES) {
- int l = 0, r = USHORT_AT(data + 2);
+ int l = 0, r = Data::u16_aligned(data + 2);
data += RANGES_HEADERSIZE;
while (l < r) {
int m = l + (r - l) / 2;
const uint8_t *rec = data + m * RANGES_RECSIZE;
- if (g < USHORT_AT(rec))
+ if (g < Data::u16_aligned(rec))
r = m;
- else if (g <= USHORT_AT(rec + 2))
- return USHORT_AT(rec + 4);
+ else if (g <= Data::u16_aligned(rec + 2))
+ return Data::u16_aligned(rec + 4);
else
l = m + 1;
}
@@ -1322,20 +1316,20 @@ ClassDef::unparse(StringAccum &sa) const throw ()
if (_str.length() == 0)
sa << "@*#!";
else if (data[1] == T_LIST) {
- Glyph start = USHORT_AT(data + 2);
- int count = USHORT_AT(data + 4);
+ Glyph start = Data::u16_aligned(data + 2);
+ int count = Data::u16_aligned(data + 4);
for (int i = 0; i < count; i++) {
if (i) sa << ',';
- sa << start + i << '=' << USHORT_AT(data + LIST_HEADERSIZE + i*LIST_RECSIZE);
+ sa << start + i << '=' << Data::u16_aligned(data + LIST_HEADERSIZE + i*LIST_RECSIZE);
}
} else {
for (int pos = RANGES_HEADERSIZE; pos < _str.length(); pos += RANGES_RECSIZE) {
- Glyph start = USHORT_AT(data + pos);
- Glyph end = USHORT_AT(data + pos + 2);
+ Glyph start = Data::u16_aligned(data + pos);
+ Glyph end = Data::u16_aligned(data + pos + 2);
if (pos > RANGES_HEADERSIZE) sa << ',';
sa << start;
if (end != start) sa << '.' << '.' << end;
- sa << '=' << USHORT_AT(data + pos + 4);
+ sa << '=' << Data::u16_aligned(data + pos + 4);
}
}
}
@@ -1367,10 +1361,10 @@ ClassDef::class_iterator::class_iterator(const String &str, int pos, int the_cla
// iterator if necessary
const uint8_t *data = _str.udata();
if (_str.length()) {
- switch (USHORT_AT(data)) {
+ switch (Data::u16_aligned(data)) {
case T_LIST: {
- Glyph start = USHORT_AT(data + 2);
- int nglyphs = USHORT_AT(data + 4);
+ Glyph start = Data::u16_aligned(data + 2);
+ int nglyphs = Data::u16_aligned(data + 4);
_str = _str.substring(0, LIST_HEADERSIZE + nglyphs*LIST_RECSIZE);
if (!_coviter)
_coviter = Coverage(start, start + nglyphs - 1).begin();
@@ -1379,11 +1373,11 @@ ClassDef::class_iterator::class_iterator(const String &str, int pos, int the_cla
break;
}
case T_RANGES: {
- Glyph start = USHORT_AT(data + RANGES_HEADERSIZE);
- int nranges = USHORT_AT(data + 2);
+ Glyph start = Data::u16_aligned(data + RANGES_HEADERSIZE);
+ int nranges = Data::u16_aligned(data + 2);
_str = _str.substring(0, RANGES_HEADERSIZE + nranges*RANGES_RECSIZE);
if (!_coviter) {
- Glyph end = USHORT_AT(data + RANGES_HEADERSIZE + 2 + (nranges - 1)*RANGES_RECSIZE);
+ Glyph end = Data::u16_aligned(data + RANGES_HEADERSIZE + 2 + (nranges - 1)*RANGES_RECSIZE);
_coviter = Coverage(start, end).begin();
}
if (_class)
@@ -1418,7 +1412,7 @@ ClassDef::class_iterator::increment_class0()
_pos = FIRST_POS;
if (_pos == FIRST_POS && _coviter) {
- if (*_coviter < USHORT_AT(data + (is_list ? 2 : RANGES_HEADERSIZE)))
+ if (*_coviter < Data::u16_aligned(data + (is_list ? 2 : RANGES_HEADERSIZE)))
return;
_pos = (is_list ? LIST_HEADERSIZE : RANGES_HEADERSIZE);
}
@@ -1426,21 +1420,21 @@ ClassDef::class_iterator::increment_class0()
while (_pos > 0 && _pos < len && _coviter) {
Glyph g = *_coviter;
if (is_list) {
- _pos = LIST_HEADERSIZE + LIST_RECSIZE*(g - USHORT_AT(data + 2));
+ _pos = LIST_HEADERSIZE + LIST_RECSIZE*(g - Data::u16_aligned(data + 2));
if (_pos >= len)
break;
- else if (USHORT_AT(data + _pos) == 0) // _class == 0
+ else if (Data::u16_aligned(data + _pos) == 0) // _class == 0
return;
_coviter++;
} else {
- if (g < USHORT_AT(data + _pos)) // in a zero range
+ if (g < Data::u16_aligned(data + _pos)) // in a zero range
return;
- else if (g > USHORT_AT(data + _pos + 2))
+ else if (g > Data::u16_aligned(data + _pos + 2))
_pos += RANGES_RECSIZE;
- else if (USHORT_AT(data + _pos + 4) == 0) // _class == 0
+ else if (Data::u16_aligned(data + _pos + 4) == 0) // _class == 0
return;
else
- _coviter.forward_to(USHORT_AT(data + _pos + 2) + 1);
+ _coviter.forward_to(Data::u16_aligned(data + _pos + 2) + 1);
}
}
@@ -1470,18 +1464,18 @@ ClassDef::class_iterator::operator++(int)
while (_pos < len && _coviter) {
Glyph g = *_coviter;
if (is_list) {
- _pos = LIST_HEADERSIZE + LIST_RECSIZE*(g - USHORT_AT(data + 2));
- if (_pos >= len || USHORT_AT(data + _pos) == _class)
+ _pos = LIST_HEADERSIZE + LIST_RECSIZE*(g - Data::u16_aligned(data + 2));
+ if (_pos >= len || Data::u16_aligned(data + _pos) == _class)
return;
_coviter++;
} else {
- while (_pos < len && (g > USHORT_AT(data + _pos + 2)
- || USHORT_AT(data + _pos + 4) != _class))
+ while (_pos < len && (g > Data::u16_aligned(data + _pos + 2)
+ || Data::u16_aligned(data + _pos + 4) != _class))
_pos += RANGES_RECSIZE;
// now, _pos >= len, or g <= rec.end && class == rec.class
- if (_pos >= len || g >= USHORT_AT(data + _pos))
+ if (_pos >= len || g >= Data::u16_aligned(data + _pos))
return;
- _coviter.forward_to(USHORT_AT(data + _pos));
+ _coviter.forward_to(Data::u16_aligned(data + _pos));
}
}
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfcmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfcmap.cc
index b62b7188b86..d7a74c85968 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfcmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfcmap.cc
@@ -23,9 +23,9 @@
#include <string.h>
#include <efont/otfdata.hh> // for ntohl()
-#define USHORT_AT(d) (ntohs(*(const uint16_t *)(d)))
-#define SHORT_AT(d) ((int16_t) ntohs(*(const uint16_t *)(d)))
-#define ULONG_AT(d) (ntohl(*(const uint32_t *)(d)))
+#define USHORT_AT(d) (Data::u16_aligned(d))
+#define SHORT_AT(d) (Data::s16_aligned(d))
+#define ULONG_AT(d) (Data::u32_aligned(d))
namespace Efont { namespace OpenType {
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdata.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdata.cc
index 46c7c885c59..46c7c885c59 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdata.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdata.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdescrip.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdescrip.cc
index 307f0b3cb61..307f0b3cb61 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfdescrip.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfdescrip.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgpos.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgpos.cc
index eb477256c5c..eb477256c5c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgpos.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgpos.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgsub.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgsub.cc
index 10597847270..10597847270 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfgsub.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfgsub.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfname.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfname.cc
index 642b41fb845..ee2151b92ca 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfname.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfname.cc
@@ -24,7 +24,7 @@
#include <string.h>
#include <algorithm>
-#define USHORT_AT(d) (ntohs(*(const uint16_t *)(d)))
+#define USHORT_AT(d) (Data::u16_aligned(d))
namespace Efont { namespace OpenType {
@@ -73,8 +73,7 @@ static const uint16_t mac_roman_encoding[] = {
Name::Name(const String &s, ErrorHandler *errh)
- : _str(s)
-{
+ : _str(s) {
_str.align(2);
_error = parse_header(errh ? errh : ErrorHandler::silent_handler());
}
@@ -103,7 +102,7 @@ String
Name::name(const_iterator i) const
{
if (i < end()) {
- int stringOffset = USHORT_AT(_str.data() + 4);
+ int stringOffset = USHORT_AT(_str.udata() + 4);
int length = USHORT_AT(reinterpret_cast<const uint8_t *>(i) + 8);
int offset = USHORT_AT(reinterpret_cast<const uint8_t *>(i) + 10);
if (stringOffset + offset + length <= _str.length())
@@ -119,22 +118,22 @@ Name::utf8_name(const_iterator i) const
// but that's it
if (!(i < end()))
return String();
- int stringOffset = USHORT_AT(_str.data() + 4);
+ int stringOffset = USHORT_AT(_str.udata() + 4);
int length = USHORT_AT(reinterpret_cast<const uint8_t *>(i) + 8);
int offset = USHORT_AT(reinterpret_cast<const uint8_t *>(i) + 10);
if (stringOffset + offset + length > _str.length())
return String();
- const char *begins = _str.data() + stringOffset + offset;
- const char *ends = begins + length;
+ const unsigned char *begins = _str.udata() + stringOffset + offset;
+ const unsigned char *ends = begins + length;
if (platform(*i) == P_MICROSOFT && encoding(*i) == E_MS_UNICODE_BMP) {
StringAccum sa;
- for (const char *s = begins; s + 1 < ends; s += 2)
- sa.append_utf8(USHORT_AT(s));
+ for (const unsigned char *s = begins; s + 1 < ends; s += 2)
+ sa.append_utf8(Data::u16(s));
return sa.take_string();
} else if (platform(*i) == P_MACINTOSH && encoding(*i) == E_MAC_ROMAN) {
StringAccum sa;
- for (const char *s = begins; s < ends; s++)
- if ((unsigned char) *s >= 0x80) {
+ for (const unsigned char *s = begins; s < ends; s++)
+ if (*s >= 0x80) {
sa.append(begins, s);
sa.append_utf8(mac_roman_encoding[*s & 0x7F]);
begins = s + 1;
@@ -191,4 +190,5 @@ Name::version_chaincontext_reverse_backtrack() const
return true;
}
-}}
+} // namespace Efont::OpenType
+} // namespace Efont
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfos2.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfos2.cc
index 9831fb49543..9831fb49543 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfos2.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfos2.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfpost.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfpost.cc
index b514f234f4b..eb45845d468 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/otfpost.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/otfpost.cc
@@ -23,10 +23,10 @@
#include <string.h>
#include <efont/otfdata.hh> // for ntohl()
-#define USHORT_AT(d) (ntohs(*(const uint16_t *)(d)))
-#define SHORT_AT(d) ((int16_t) ntohs(*(const uint16_t *)(d)))
-#define ULONG_AT(d) (ntohl(*(const uint32_t *)(d)))
-#define LONG_AT(d) ((int32_t) ntohl(*(const uint32_t *)(d)))
+#define USHORT_AT(d) (Data::u16_aligned(d))
+#define SHORT_AT(d) (Data::s16_aligned(d))
+#define ULONG_AT(d) (Data::u32_aligned(d))
+#define LONG_AT(d) (Data::s32_aligned(d))
namespace Efont { namespace OpenType {
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/pairop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/pairop.cc
index 5b64be1ac41..5b64be1ac41 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/pairop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/pairop.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/psres.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/psres.cc
index 2136a6b3237..2136a6b3237 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/psres.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/psres.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1bounds.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1bounds.cc
index ccea404d4d3..ccea404d4d3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1bounds.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1bounds.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1cs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1cs.cc
index 4db3afa5a9d..4db3afa5a9d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1cs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1cs.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1csgen.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1csgen.cc
index b24c8f21307..b24c8f21307 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1csgen.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1csgen.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1font.cc
index 05b97fa346e..05b97fa346e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1font.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1fontskel.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1fontskel.cc
index e5e48023348..e5e48023348 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1fontskel.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1fontskel.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1interp.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1interp.cc
index 7b607bb407d..7b607bb407d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1interp.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1interp.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1item.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1item.cc
index 5e169b66f13..5e169b66f13 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1item.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1item.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1mm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1mm.cc
index 404335a8f20..404335a8f20 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1mm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1mm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1rw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1rw.cc
index 846297e6b67..846297e6b67 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1rw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1rw.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1unparser.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1unparser.cc
index 993253deec9..993253deec9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/t1unparser.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/t1unparser.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfcs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfcs.cc
index d427cf17bcc..d427cf17bcc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfcs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfcs.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfhead.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfhead.cc
index 5be8676c64c..5be8676c64c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfhead.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfhead.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfkern.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfkern.cc
index 824922457ac..824922457ac 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/ttfkern.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/libefont/ttfkern.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.am
index 0cc406d4e70..0cc406d4e70 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.in
index 8f5e2818def..8043b2bb72e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@FIXLIBC_TRUE@am__append_1 = fixlibc.c
-subdir = lcdf-typetools-2.97/liblcdf
+subdir = lcdf-typetools-2.98/liblcdf
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -330,9 +330,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/liblcdf/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/liblcdf/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/liblcdf/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/liblcdf/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/bezier.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/bezier.cc
index 95c8d8b9fb0..95c8d8b9fb0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/bezier.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/bezier.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/clp.c
index b8aaafd2096..b8aaafd2096 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/clp.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/clp.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/error.cc
index 0ca36c703d5..cfef2f07de9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/error.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/error.cc
@@ -4,7 +4,7 @@
* Eddie Kohler
*
* Copyright (c) 1999-2000 Massachusetts Institute of Technology
- * Copyright (c) 2001-2012 Eddie Kohler
+ * Copyright (c) 2001-2013 Eddie Kohler
* Copyright (c) 2008 Meraki, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -629,7 +629,7 @@ ErrorHandler::vxformat(int default_flags, const char *s, va_list val)
if ((flags & cf_signed) && (int64_t)qnum < 0)
qnum = -(int64_t) qnum, flags |= cf_negative;
StringAccum sa;
- sa.append_numeric(static_cast<String::uint_large_t>(qnum), base, (flags & cf_uppercase));
+ sa.append_numeric(static_cast<String::uintmax_t>(qnum), base, (flags & cf_uppercase));
s1 = s2 - sa.length();
memcpy(const_cast<char*>(s1), sa.data(), s2 - s1);
goto got_number;
@@ -659,6 +659,13 @@ ErrorHandler::vxformat(int default_flags, const char *s, va_list val)
goto number;
case 'p': {
+ if (*s == '{') {
+ s1 = s2 = s + 1;
+ while (*s2 && *s2 != '}' && !isspace((unsigned char) *s2))
+ ++s2;
+ if (*s2 == '}')
+ goto braces;
+ }
void *v = va_arg(val, void *);
s2 = numbuf + NUMBUF_SIZE;
s1 = do_number((unsigned long)v, (char *)s2, 16, flags);
@@ -689,21 +696,24 @@ ErrorHandler::vxformat(int default_flags, const char *s, va_list val)
}
#endif
- case '{': {
- const char *rbrace = strchr(s, '}');
- if (!rbrace || rbrace == s)
- assert(0 /* Bad %{ in error */);
- String name(s, rbrace - s);
- s = rbrace + 1;
+ case '{':
+ s1 = s2 = s;
+ while (*s2 && *s2 != '}' && !isspace((unsigned char) *s2))
+ ++s2;
+ if (*s2 != '}')
+ goto error;
+ goto braces;
+
+ braces:
+ s = s2 + 1;
for (Conversion *item = error_items; item; item = item->next)
- if (item->name == name) {
+ if (item->name.equals(s1, s2 - s1)) {
strstore = item->hook(flags, VA_LIST_REF(val));
s1 = strstore.begin();
s2 = strstore.end();
goto got_result;
}
goto error;
- }
error:
default:
@@ -1079,28 +1089,28 @@ ContextErrorHandler::ContextErrorHandler(ErrorHandler *errh, const char *fmt,
String
ContextErrorHandler::decorate(const String &str)
{
- String cstr = ErrorVeneer::decorate(str), context_anno;
- const char *cstr_endanno = parse_anno(cstr, cstr.begin(), cstr.end(),
- "context", &context_anno,
- (const char *) 0);
+ String context_anno;
+ const char *str_endanno = parse_anno(str, str.begin(), str.end(),
+ "context", &context_anno,
+ (const char *) 0);
if (context_anno.equals("no", 2))
- return cstr;
+ return ErrorVeneer::decorate(str);
- String icstr;
+ String istr;
if (context_anno.equals("noindent", 8))
- icstr = combine_anno(cstr, _context_landmark);
+ istr = combine_anno(str, _context_landmark);
else
- icstr = combine_anno(cstr, _context_landmark + _indent);
+ istr = combine_anno(str, _context_landmark + _indent);
if (!_context_printed && !context_anno.equals("nocontext", 9)) {
String astr = combine_anno(combine_anno(_context, _context_landmark),
- cstr.substring(cstr.begin(), cstr_endanno));
+ str.substring(str.begin(), str_endanno));
if (astr && astr.back() != '\n')
astr += '\n';
_context_printed = true;
- return ErrorVeneer::decorate(astr) + icstr;
+ return ErrorVeneer::decorate(astr + istr);
} else
- return icstr;
+ return ErrorVeneer::decorate(istr);
}
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/filename.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/filename.cc
index 396e81cd3c5..396e81cd3c5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/filename.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/filename.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/fixlibc.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/fixlibc.c
index d41238daf85..d41238daf85 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/fixlibc.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/fixlibc.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/globmatch.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/globmatch.cc
index dcd7afc135c..dcd7afc135c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/globmatch.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/globmatch.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/landmark.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/landmark.cc
index 68511055ddc..68511055ddc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/landmark.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/landmark.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/md5.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/md5.c
index 557a39bef95..557a39bef95 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/md5.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/md5.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/permstr.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/permstr.cc
index c6aebab31e7..c6aebab31e7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/permstr.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/permstr.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/point.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/point.cc
index 8b23fdcb571..8b23fdcb571 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/point.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/point.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/slurper.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/slurper.cc
index e089617705d..e089617705d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/slurper.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/slurper.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/straccum.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/straccum.cc
index f31b9e216fc..f31b9e216fc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/straccum.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/straccum.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/string.cc
index ec14c378f20..ec14c378f20 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/string.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/string.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/strtonum.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/strtonum.c
index 36898c5a7ad..36898c5a7ad 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/strtonum.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/strtonum.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/transform.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/transform.cc
index 5eb0ff58728..5eb0ff58728 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/transform.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/transform.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/vectorv.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/vectorv.cc
index f5f12b52c90..f5f12b52c90 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/vectorv.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/liblcdf/vectorv.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/m4/lcdf-typetools.m4 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/m4/lcdf-typetools.m4
index 7aaff4c33af..7aaff4c33af 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/m4/lcdf-typetools.m4
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/m4/lcdf-typetools.m4
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.am
index 6438927eb5f..6438927eb5f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.in
index b4659c20b32..484a5a081c3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = mmafm$(EXEEXT)
-subdir = lcdf-typetools-2.97/mmafm
+subdir = lcdf-typetools-2.98/mmafm
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -325,9 +325,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/mmafm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/mmafm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/mmafm/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/mmafm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/main.cc
index 99e320f94bd..99e320f94bd 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/main.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/mmafm.1
index 2a118d8caa2..d70a6b8743b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/mmafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmafm/mmafm.1
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.am
index 527b7d14937..527b7d14937 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.in
index dbbf85651b8..c070413b61c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = mmpfb$(EXEEXT)
-subdir = lcdf-typetools-2.97/mmpfb
+subdir = lcdf-typetools-2.98/mmpfb
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -348,9 +348,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/mmpfb/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/mmpfb/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/mmpfb/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/mmpfb/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/main.cc
index 1d685f18eff..1d685f18eff 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/main.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/mmpfb.1
index d3795528ac4..e2f20aa9b7d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/mmpfb.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/mmpfb.1
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.cc
index 1325b44d3e6..1325b44d3e6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.hh
index ffe35668f94..ffe35668f94 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/myfont.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/myfont.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.cc
index 2c4b1bcb015..2c4b1bcb015 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.hh
index a5c3ea04906..a5c3ea04906 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1minimize.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1minimize.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.cc
index 86382ca239b..86382ca239b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.hh
index eac9d75beeb..eac9d75beeb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/t1rewrit.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/mmpfb/t1rewrit.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.am
index 837eb83ef0f..837eb83ef0f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.in
index 0455e6636bc..dc32f230065 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = otfinfo$(EXEEXT)
-subdir = lcdf-typetools-2.97/otfinfo
+subdir = lcdf-typetools-2.98/otfinfo
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -327,9 +327,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/otfinfo/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/otfinfo/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/otfinfo/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/otfinfo/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.1
index a3367e28c7e..746e14dd8b5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.1
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.cc
index 74d340c3d45..74d340c3d45 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/otfinfo.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otfinfo/otfinfo.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.am
index d75c552f12e..d75c552f12e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.in
index ab41c885be4..bf817b1a42d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/Makefile.in
@@ -55,7 +55,7 @@ bin_PROGRAMS = otftotfm$(EXEEXT)
@have_kpathsea_TRUE@am__append_2 = $(KPATHSEA_INCLUDES)
@have_kpathsea_TRUE@am__append_3 = $(KPATHSEA_LIBS)
@have_kpathsea_TRUE@am__append_4 = $(KPATHSEA_DEPEND)
-subdir = lcdf-typetools-2.97/otftotfm
+subdir = lcdf-typetools-2.98/otftotfm
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -364,9 +364,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/otftotfm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/otftotfm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/otftotfm/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/otftotfm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.cc
index aae70b16b58..aae70b16b58 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.hh
index 4c973347715..4c973347715 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/automatic.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/automatic.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.cc
index 870c7d02885..870c7d02885 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.hh
index a80631c3038..a80631c3038 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/dvipsencoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/dvipsencoding.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.cc
index a4120660bfc..a4120660bfc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.hh
index 753e5714d5c..753e5714d5c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/glyphfilter.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/glyphfilter.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.c
index e42b81fa24a..e42b81fa24a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.h
index c822a24fa1e..c822a24fa1e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/kpseinterface.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/kpseinterface.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.cc
index b4427f3f6fa..b4427f3f6fa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.hh
index b032e6b348f..b032e6b348f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.1
index 2f10c846def..96e9ac64383 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.1
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.cc
index e36e1c63edf..e36e1c63edf 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.hh
index 67c0e0b32ab..67c0e0b32ab 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/otftotfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.cc
index a951bc7d304..a951bc7d304 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.hh
index c349a48dcf6..c349a48dcf6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/secondary.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/secondary.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.cc
index 228661394a9..228661394a9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.hh
index 4dd6b135eb7..4dd6b135eb7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/uniprop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/uniprop.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.cc
index b50ff9566d3..b50ff9566d3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.hh
index a3e42b63d9f..a3e42b63d9f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/util.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.am
index 9b9b16ca77b..9b9b16ca77b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.in
index fd42c918420..4c20b65f152 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1dotlessj$(EXEEXT)
-subdir = lcdf-typetools-2.97/t1dotlessj
+subdir = lcdf-typetools-2.98/t1dotlessj
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -325,9 +325,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1dotlessj/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1dotlessj/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1dotlessj/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1dotlessj/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.1
index 2cefd72e985..b51f210dcb2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.1
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc
index aa1bae00aee..aa1bae00aee 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/t1dotlessj.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1dotlessj/t1dotlessj.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.am
index 42cd92087d4..42cd92087d4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.in
index 5eeccb47cd2..6aa7bd5c7aa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1lint$(EXEEXT)
-subdir = lcdf-typetools-2.97/t1lint
+subdir = lcdf-typetools-2.98/t1lint
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -345,9 +345,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1lint/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1lint/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1lint/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1lint/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.cc
index f39a040a014..f39a040a014 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.hh
index 9ba167b1588..9ba167b1588 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/cscheck.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/cscheck.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.1
index add7cbd043a..b29c432a507 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.1
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.cc
index e2ac1012382..e2ac1012382 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/t1lint.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1lint/t1lint.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.am
index 815d0efad89..815d0efad89 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.in
index 89826e4cc82..64710129b27 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1rawafm$(EXEEXT)
-subdir = lcdf-typetools-2.97/t1rawafm
+subdir = lcdf-typetools-2.98/t1rawafm
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -325,9 +325,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1rawafm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1rawafm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1rawafm/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1rawafm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.1
index 90bb3ece91b..9227baa5955 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.1
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.cc
index 8ba7c7531fb..8ba7c7531fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/t1rawafm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1rawafm/t1rawafm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.am
index 1cb4c402f15..1cb4c402f15 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.in
index 31f65236af3..b1e643f3c65 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1reencode$(EXEEXT)
-subdir = lcdf-typetools-2.97/t1reencode
+subdir = lcdf-typetools-2.98/t1reencode
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -345,9 +345,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1reencode/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1reencode/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1reencode/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1reencode/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.1
index dd77323ff47..1dbf7b0ffc4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.1
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.cc
index 952d3f87bdc..952d3f87bdc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/t1reencode.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/t1reencode.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.cc
index 89f43391152..89f43391152 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.hh
index 34b9c9c5a22..34b9c9c5a22 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1reencode/util.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.am
index eac56ee9066..eac56ee9066 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.in
index fc5b1582b89..33a74f93ede 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1testpage$(EXEEXT)
-subdir = lcdf-typetools-2.97/t1testpage
+subdir = lcdf-typetools-2.98/t1testpage
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -325,9 +325,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1testpage/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1testpage/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/t1testpage/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/t1testpage/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.1
index e67c23cd277..201b9632e46 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.1
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.cc
index ed3d7330a13..ed3d7330a13 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/t1testpage.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/t1testpage/t1testpage.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist-g2u.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist-g2u.txt
index 2340809a4de..2340809a4de 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist-g2u.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist-g2u.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist.txt
index b9c5fa9af0f..b9c5fa9af0f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/texglyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/texglyphlist.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.am
index a55d65d82c4..a55d65d82c4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.in
index 23d4edec362..1b3036b9747 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/Makefile.in
@@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = ttftotype42$(EXEEXT)
-subdir = lcdf-typetools-2.97/ttftotype42
+subdir = lcdf-typetools-2.98/ttftotype42
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -325,9 +325,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.97/ttftotype42/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.98/ttftotype42/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.97/ttftotype42/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.98/ttftotype42/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.1
index bb84d6ad792..0dcab2a2053 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.1
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.98
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.cc
index 0c3567e874c..0c3567e874c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/ttftotype42.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.98/ttftotype42/ttftotype42.cc
diff --git a/Build/source/texk/lcdf-typetools/version.ac b/Build/source/texk/lcdf-typetools/version.ac
index 329ba6e0426..57c78c5f88b 100644
--- a/Build/source/texk/lcdf-typetools/version.ac
+++ b/Build/source/texk/lcdf-typetools/version.ac
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current lcdf-typetools version
-m4_define([lcdf_typetools_version], [2.97])
+m4_define([lcdf_typetools_version], [2.98])