summaryrefslogtreecommitdiff
path: root/Build/source/texk/lcdf-typetools
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 11:50:15 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 11:50:15 +0000
commit508bffe4408ab137d9057b15075c94e1578b619d (patch)
tree4cdbd91ac769001158f12fc0990450d49e2d9f98 /Build/source/texk/lcdf-typetools
parent64fe938576a88aa23a68f5855f56370cb302a923 (diff)
lcdf-typetools 2.1001
git-svn-id: svn://tug.org/texlive/trunk@34286 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools')
-rw-r--r--Build/source/texk/lcdf-typetools/ChangeLog5
-rwxr-xr-xBuild/source/texk/lcdf-typetools/configure94
-rw-r--r--Build/source/texk/lcdf-typetools/configure.ac10
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-10-SELFAUTO36
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/ChangeLog (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/ChangeLog)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/TL-Changes (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/TL-Changes)3
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/patch-20-TL-binary (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-20-TL-binary)50
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/patch-21-TL-paths (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-21-TL-paths)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/patch-30-W32TeX (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-30-W32TeX)24
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/7t.enc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/7t.enc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/COPYING (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/COPYING)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/INSTALL (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/INSTALL)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/NEWS (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/NEWS)13
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ONEWS (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ONEWS)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/README (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/README)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/autoconf.h.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/autoconf.h.in)3
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/cfftot1.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/cfftot1.1)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/cfftot1.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/cfftot1.cc)12
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/maket1font.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/maket1font.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/maket1font.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/maket1font.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/configure.ac (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/configure.ac)14
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/glyphlist.txt (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/glyphlist.txt)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/glyphtounicode.tex (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/glyphtounicode.tex)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/config.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/config.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/afm.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/afm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/afmparse.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/afmparse.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/afmw.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/afmw.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/amfm.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/amfm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/cff.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/cff.hh)22
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/encoding.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/encoding.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/findmet.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/findmet.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/metrics.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/metrics.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otf.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otf.hh)22
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfcmap.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfcmap.hh)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfdata.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfdata.hh)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfgpos.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfgpos.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfgsub.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfgsub.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfname.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfname.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfos2.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfos2.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfpost.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfpost.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/pairop.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/pairop.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/psres.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/psres.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1bounds.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1bounds.hh)10
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1cs.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1cs.hh)11
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1csgen.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1csgen.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1font.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1font.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1interp.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1interp.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1item.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1item.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1mm.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1mm.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1rw.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1rw.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1unparser.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1unparser.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/ttfcs.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/ttfcs.hh)5
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/ttfhead.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/ttfhead.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/ttfkern.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/ttfkern.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/bezier.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/bezier.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/clp.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/clp.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/error.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/error.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/filename.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/filename.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/globmatch.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/globmatch.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/hashcode.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/hashcode.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/hashmap.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/hashmap.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/hashmap.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/hashmap.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/inttypes.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/inttypes.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/landmark.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/landmark.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/md5.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/md5.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/permstr.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/permstr.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/point.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/point.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/slurper.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/slurper.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/straccum.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/straccum.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/string.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/string.hh)8
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/strtonum.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/strtonum.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/transform.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/transform.hh)28
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/vector.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/vector.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/vector.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/vector.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/lcdf-typetools.spec (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/lcdf-typetools.spec)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/afm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/afm.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/afmparse.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/afmparse.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/afmw.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/afmw.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/amfm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/amfm.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/cff.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/cff.cc)13
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/encoding.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/encoding.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/findmet.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/findmet.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/metrics.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/metrics.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otf.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otf.cc)9
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfcmap.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfcmap.cc)18
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfdata.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfdata.cc)2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfdescrip.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfdescrip.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfgpos.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfgpos.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfgsub.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfgsub.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfname.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfname.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfos2.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfos2.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfpost.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfpost.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/pairop.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/pairop.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/psres.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/psres.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1bounds.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1bounds.cc)40
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1cs.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1cs.cc)13
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1csgen.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1csgen.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1font.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1font.cc)8
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1fontskel.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1fontskel.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1interp.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1interp.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1item.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1item.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1mm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1mm.cc)5
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1rw.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1rw.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1unparser.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1unparser.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/ttfcs.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/ttfcs.cc)31
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/ttfhead.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/ttfhead.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/ttfkern.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/ttfkern.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/bezier.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/bezier.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/clp.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/clp.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/error.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/error.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/filename.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/filename.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/fixlibc.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/fixlibc.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/globmatch.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/globmatch.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/landmark.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/landmark.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/md5.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/md5.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/permstr.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/permstr.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/point.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/point.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/slurper.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/slurper.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/straccum.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/straccum.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/string.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/string.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/strtonum.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/strtonum.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/transform.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/transform.cc)35
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/vectorv.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/vectorv.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/m4/lcdf-typetools.m4 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/m4/lcdf-typetools.m4)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/main.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/main.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/mmafm.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/mmafm.1)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/main.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/main.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/mmpfb.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/mmpfb.1)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/myfont.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/myfont.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/myfont.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/myfont.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1minimize.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1minimize.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1minimize.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1minimize.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1rewrit.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1rewrit.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1rewrit.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1rewrit.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/otfinfo.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/otfinfo.1)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/otfinfo.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/otfinfo.cc)96
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/automatic.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/automatic.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/automatic.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/automatic.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/dvipsencoding.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/dvipsencoding.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/dvipsencoding.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/dvipsencoding.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/glyphfilter.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/glyphfilter.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/glyphfilter.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/glyphfilter.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/kpseinterface.c (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/kpseinterface.c)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/kpseinterface.h (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/kpseinterface.h)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/metrics.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/metrics.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/metrics.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/metrics.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/otftotfm.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.1)11
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/otftotfm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc)154
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/otftotfm.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.hh)5
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/secondary.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/secondary.cc)104
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/secondary.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/secondary.hh)15
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/uniprop.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/uniprop.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/uniprop.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/uniprop.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/util.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/util.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/util.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/util.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/t1dotlessj.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/t1dotlessj.1)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/t1dotlessj.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/t1dotlessj.cc)19
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/cscheck.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/cscheck.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/cscheck.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/cscheck.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/t1lint.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/t1lint.1)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/t1lint.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/t1lint.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/t1rawafm.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/t1rawafm.1)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/t1rawafm.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/t1rawafm.cc)24
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/t1reencode.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/t1reencode.1)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/t1reencode.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/t1reencode.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/util.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/util.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/util.hh (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/util.hh)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/t1testpage.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/t1testpage.1)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/t1testpage.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/t1testpage.cc)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/texglyphlist-g2u.txt (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/texglyphlist-g2u.txt)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/texglyphlist.txt (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/texglyphlist.txt)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/Makefile.am (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/Makefile.am)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/Makefile.in (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/Makefile.in)6
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/ttftotype42.1 (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/ttftotype42.1)0
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/ttftotype42.cc (renamed from Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/ttftotype42.cc)2
-rw-r--r--Build/source/texk/lcdf-typetools/tests/uhv_re.afm2
-rw-r--r--Build/source/texk/lcdf-typetools/version.ac2
203 files changed, 656 insertions, 432 deletions
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
index b6d2cf73c5e..1baf35a64aa 100644
--- a/Build/source/texk/lcdf-typetools/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import lcdf-typetools-2.101.
+ * version.ac, tests/uhv_re.afm: Adapted.
+
2014-01-09 Peter Breitenlohner <peb@mppmu.mpg.de>
Import lcdf-typetools-2.100.
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index a575cc41f4b..d7c6f1fa34c 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 (TeX Live) 2.100.
+# Generated by GNU Autoconf 2.69 for LCDF typetools (TeX Live) 2.101.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,12 +590,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='LCDF typetools (TeX Live)'
PACKAGE_TARNAME='lcdf-typetools--tex-live-'
-PACKAGE_VERSION='2.100'
-PACKAGE_STRING='LCDF typetools (TeX Live) 2.100'
+PACKAGE_VERSION='2.101'
+PACKAGE_STRING='LCDF typetools (TeX Live) 2.101'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="lcdf-typetools-2.100/NEWS"
+ac_unique_file="lcdf-typetools-2.101/NEWS"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1366,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 (TeX Live) 2.100 to adapt to many kinds of systems.
+\`configure' configures LCDF typetools (TeX Live) 2.101 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1437,7 +1437,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LCDF typetools (TeX Live) 2.100:";;
+ short | recursive ) echo "Configuration of LCDF typetools (TeX Live) 2.101:";;
esac
cat <<\_ACEOF
@@ -1579,7 +1579,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LCDF typetools (TeX Live) configure 2.100
+LCDF typetools (TeX Live) configure 2.101
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2739,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 (TeX Live) $as_me 2.100, which was
+It was created by LCDF typetools (TeX Live) $as_me 2.101, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8229,7 +8229,7 @@ fi
# Define the identity of the package.
PACKAGE='lcdf-typetools--tex-live-'
- VERSION='2.100'
+ VERSION='2.101'
cat >>confdefs.h <<_ACEOF
@@ -13529,7 +13529,7 @@ fi
-LCDF_TYPETOOLS_VERSION=2.100
+LCDF_TYPETOOLS_VERSION=2.101
ac_config_headers="$ac_config_headers autoconf.h"
@@ -19263,7 +19263,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-LCDF typetools (TeX Live) config.lt 2.100
+LCDF typetools (TeX Live) config.lt 2.101
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20672,10 +20672,10 @@ fi
if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$enable_texlive_build" != xyes; then
kpsewhich='kpsewhich'
test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich"
- SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null`
- SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null`
- SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null`
- SELFAUTOGRANDPARENT=`$kpsewhich --expand-var='$SELFAUTOGRANDPARENT' 2>/dev/null`
+ SELFAUTOLOC="`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null`"
+ SELFAUTODIR="`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null`"
+ SELFAUTOPARENT="`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null`"
+ SELFAUTOGRANDPARENT="`$kpsewhich --expand-var='$SELFAUTOGRANDPARENT' 2>/dev/null`"
if test -z "$SELFAUTODIR"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
=========================================
@@ -20709,7 +20709,7 @@ cat >>confdefs.h <<_ACEOF
#define SELFAUTOPARENT "$SELFAUTOPARENT"
_ACEOF
- if test -n "$SELFAUTOGRANDPARENT"; then
+ if test -n "$SELFAUTOGRANDPARENT" -a "$SELFAUTOGRANDPARENT" != '$SELFAUTOGRANDPARENT'; then
cat >>confdefs.h <<_ACEOF
#define SELFAUTOGRANDPARENT "$SELFAUTOGRANDPARENT"
@@ -20760,24 +20760,24 @@ _ACEOF
-LCDF_TYPETOOLS_TREE=lcdf-typetools-2.100
+LCDF_TYPETOOLS_TREE=lcdf-typetools-2.101
-ac_config_files="$ac_config_files Makefile lcdf-typetools-2.100/Makefile"
+ac_config_files="$ac_config_files Makefile lcdf-typetools-2.101/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/liblcdf/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/libefont/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/cfftot1/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/mmafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/mmpfb/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/otfinfo/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/otftotfm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/t1dotlessj/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/t1lint/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/t1rawafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/t1reencode/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/t1testpage/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-2.100/ttftotype42/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/liblcdf/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/libefont/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/cfftot1/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/mmafm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/mmpfb/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/otfinfo/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/otftotfm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/t1dotlessj/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/t1lint/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/t1rawafm/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/t1reencode/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/t1testpage/Makefile"
+ac_config_files="$ac_config_files lcdf-typetools-2.101/ttftotype42/Makefile"
cat >confcache <<\_ACEOF
@@ -21331,7 +21331,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 (TeX Live) $as_me 2.100, which was
+This file was extended by LCDF typetools (TeX Live) $as_me 2.101, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21397,7 +21397,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 (TeX Live) config.status 2.100
+LCDF typetools (TeX Live) config.status 2.101
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -21910,20 +21910,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.100/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/Makefile" ;;
- "lcdf-typetools-2.100/liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/liblcdf/Makefile" ;;
- "lcdf-typetools-2.100/libefont/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/libefont/Makefile" ;;
- "lcdf-typetools-2.100/cfftot1/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/cfftot1/Makefile" ;;
- "lcdf-typetools-2.100/mmafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/mmafm/Makefile" ;;
- "lcdf-typetools-2.100/mmpfb/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/mmpfb/Makefile" ;;
- "lcdf-typetools-2.100/otfinfo/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/otfinfo/Makefile" ;;
- "lcdf-typetools-2.100/otftotfm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/otftotfm/Makefile" ;;
- "lcdf-typetools-2.100/t1dotlessj/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/t1dotlessj/Makefile" ;;
- "lcdf-typetools-2.100/t1lint/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/t1lint/Makefile" ;;
- "lcdf-typetools-2.100/t1rawafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/t1rawafm/Makefile" ;;
- "lcdf-typetools-2.100/t1reencode/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/t1reencode/Makefile" ;;
- "lcdf-typetools-2.100/t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/t1testpage/Makefile" ;;
- "lcdf-typetools-2.100/ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.100/ttftotype42/Makefile" ;;
+ "lcdf-typetools-2.101/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/Makefile" ;;
+ "lcdf-typetools-2.101/liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/liblcdf/Makefile" ;;
+ "lcdf-typetools-2.101/libefont/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/libefont/Makefile" ;;
+ "lcdf-typetools-2.101/cfftot1/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/cfftot1/Makefile" ;;
+ "lcdf-typetools-2.101/mmafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/mmafm/Makefile" ;;
+ "lcdf-typetools-2.101/mmpfb/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/mmpfb/Makefile" ;;
+ "lcdf-typetools-2.101/otfinfo/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/otfinfo/Makefile" ;;
+ "lcdf-typetools-2.101/otftotfm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/otftotfm/Makefile" ;;
+ "lcdf-typetools-2.101/t1dotlessj/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/t1dotlessj/Makefile" ;;
+ "lcdf-typetools-2.101/t1lint/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/t1lint/Makefile" ;;
+ "lcdf-typetools-2.101/t1rawafm/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/t1rawafm/Makefile" ;;
+ "lcdf-typetools-2.101/t1reencode/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/t1reencode/Makefile" ;;
+ "lcdf-typetools-2.101/t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/t1testpage/Makefile" ;;
+ "lcdf-typetools-2.101/ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES lcdf-typetools-2.101/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 95911448e24..ddeae4fe3a7 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -341,10 +341,10 @@ AC_ARG_ENABLE([selfauto-set],
if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$enable_texlive_build" != xyes; then
kpsewhich='kpsewhich'
test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich"
- SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null`
- SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null`
- SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null`
- SELFAUTOGRANDPARENT=`$kpsewhich --expand-var='$SELFAUTOGRANDPARENT' 2>/dev/null`
+ SELFAUTOLOC="`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null`"
+ SELFAUTODIR="`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null`"
+ SELFAUTOPARENT="`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null`"
+ SELFAUTOGRANDPARENT="`$kpsewhich --expand-var='$SELFAUTOGRANDPARENT' 2>/dev/null`"
if test -z "$SELFAUTODIR"; then
AC_MSG_WARN([
=========================================
@@ -358,7 +358,7 @@ Either supply the correct PREFIX to --with-kpathsea, or supply
AC_DEFINE_UNQUOTED([SELFAUTOLOC], "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable])
AC_DEFINE_UNQUOTED([SELFAUTODIR], "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable])
AC_DEFINE_UNQUOTED([SELFAUTOPARENT], "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable])
- if test -n "$SELFAUTOGRANDPARENT"; then
+ if test -n "$SELFAUTOGRANDPARENT" -a "$SELFAUTOGRANDPARENT" != '$SELFAUTOGRANDPARENT'; then
AC_DEFINE_UNQUOTED([SELFAUTOGRANDPARENT], "$SELFAUTOGRANDPARENT", [kpsewhich's $SELFAUTOGRANDPARENT variable])
fi
fi
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-10-SELFAUTO b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-10-SELFAUTO
deleted file mode 100644
index bf6b8312b5f..00000000000
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-10-SELFAUTO
+++ /dev/null
@@ -1,36 +0,0 @@
- Prepare for SELFAUTOGRANDPARENT to be used in TL'14.
-
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.100.orig/configure.ac lcdf-typetools-2.100/configure.ac
---- lcdf-typetools-2.100.orig/configure.ac 2014-01-08 17:25:10.000000000 +0100
-+++ lcdf-typetools-2.100/configure.ac 2014-01-09 12:04:53.000000000 +0100
-@@ -424,6 +424,7 @@
- SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null`
- SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null`
- SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null`
-+ SELFAUTOGRANDPARENT=`$kpsewhich --expand-var='$SELFAUTOGRANDPARENT' 2>/dev/null`
- if test -z "$SELFAUTODIR"; then
- AC_MSG_WARN([
- =========================================
-@@ -437,6 +438,9 @@
- AC_DEFINE_UNQUOTED([SELFAUTOLOC], "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable])
- AC_DEFINE_UNQUOTED([SELFAUTODIR], "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable])
- AC_DEFINE_UNQUOTED([SELFAUTOPARENT], "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable])
-+ if test -n "$SELFAUTOGRANDPARENT"; then
-+ AC_DEFINE_UNQUOTED([SELFAUTOGRANDPARENT], "$SELFAUTOGRANDPARENT", [kpsewhich's $SELFAUTOGRANDPARENT variable])
-+ fi
- fi
-
-
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.100.orig/otftotfm/kpseinterface.c lcdf-typetools-2.100/otftotfm/kpseinterface.c
---- lcdf-typetools-2.100.orig/otftotfm/kpseinterface.c 2013-08-13 22:26:12.000000000 +0200
-+++ lcdf-typetools-2.100/otftotfm/kpseinterface.c 2014-01-09 12:04:52.000000000 +0100
-@@ -38,6 +38,9 @@
- #ifdef SELFAUTOPARENT
- putenv("SELFAUTOPARENT=" SELFAUTOPARENT);
- #endif
-+#ifdef SELFAUTOGRANDPARENT
-+ putenv("SELFAUTOGRANDPARENT=" SELFAUTOGRANDPARENT);
-+#endif
- }
-
- char*
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/ChangeLog
index 08d690e2cac..c798ec4bcb0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import lcdf-typetools-2.101.
+ * patch-10-SELFAUTO (removed): Now in distribution.
+ * patch-20-TL-binary, patch-21-TL-paths, patch-30-W32TeX: Adapted.
+
2014-01-09 Peter Breitenlohner <peb@mppmu.mpg.de>
Import lcdf-typetools-2.100.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/TL-Changes
index 2f51a14708d..939c7f5a6f9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/TL-Changes
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/TL-Changes
@@ -1,8 +1,9 @@
Changes applied to the lcdf-typetools tree as obtained from:
- http://www.lcdf.org/type/lcdf-typetools-2.100.tar.gz
+ http://www.lcdf.org/type/lcdf-typetools-2.101.tar.gz
Removed:
aclocal.m4
+ compile
configure
depcomp
install-sh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-20-TL-binary b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/patch-20-TL-binary
index 3ebe561425f..e53d2c9fd4b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-20-TL-binary
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-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.100.orig/liblcdf/filename.cc lcdf-typetools-2.100/liblcdf/filename.cc
---- lcdf-typetools-2.100.orig/liblcdf/filename.cc 2013-08-13 22:26:12.000000000 +0200
-+++ lcdf-typetools-2.100/liblcdf/filename.cc 2014-01-09 12:47:42.000000000 +0100
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/liblcdf/filename.cc lcdf-typetools-2.101/liblcdf/filename.cc
+--- lcdf-typetools-2.101.orig/liblcdf/filename.cc 2013-08-13 22:18:57.000000000 +0200
++++ lcdf-typetools-2.101/liblcdf/filename.cc 2014-06-17 12:55:35.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.100.orig/otftotfm/automatic.cc lcdf-typetools-2.100/otftotfm/automatic.cc
---- lcdf-typetools-2.100.orig/otftotfm/automatic.cc 2014-01-08 17:23:16.000000000 +0100
-+++ lcdf-typetools-2.100/otftotfm/automatic.cc 2014-01-09 12:47:42.000000000 +0100
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/otftotfm/automatic.cc lcdf-typetools-2.101/otftotfm/automatic.cc
+--- lcdf-typetools-2.101.orig/otftotfm/automatic.cc 2014-01-09 17:24:47.000000000 +0100
++++ lcdf-typetools-2.101/otftotfm/automatic.cc 2014-06-17 12:55:35.000000000 +0200
@@ -311,7 +311,7 @@
String ls_r = writable_texdir + "ls-R";
bool success = false;
@@ -31,10 +31,10 @@ 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.100.orig/otftotfm/otftotfm.cc lcdf-typetools-2.100/otftotfm/otftotfm.cc
---- lcdf-typetools-2.100.orig/otftotfm/otftotfm.cc 2013-08-13 22:26:12.000000000 +0200
-+++ lcdf-typetools-2.100/otftotfm/otftotfm.cc 2014-01-09 12:47:42.000000000 +0100
-@@ -555,7 +555,7 @@
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/otftotfm/otftotfm.cc lcdf-typetools-2.101/otftotfm/otftotfm.cc
+--- lcdf-typetools-2.101.orig/otftotfm/otftotfm.cc 2014-06-16 20:13:16.000000000 +0200
++++ lcdf-typetools-2.101/otftotfm/otftotfm.cc 2014-06-17 12:55:35.000000000 +0200
+@@ -582,7 +582,7 @@
if (verbose)
errh->message("creating %s", filename.c_str());
@@ -43,7 +43,7 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
if (!f) {
errh->error("%s: %s", filename.c_str(), strerror(errno));
return;
-@@ -997,7 +997,7 @@
+@@ -1024,7 +1024,7 @@
#endif
{
fclose(f);
@@ -52,10 +52,10 @@ 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.100.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.100/t1dotlessj/t1dotlessj.cc
---- lcdf-typetools-2.100.orig/t1dotlessj/t1dotlessj.cc 2013-08-13 22:26:12.000000000 +0200
-+++ lcdf-typetools-2.100/t1dotlessj/t1dotlessj.cc 2014-01-09 12:47:42.000000000 +0100
-@@ -403,10 +403,10 @@
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.101/t1dotlessj/t1dotlessj.cc
+--- lcdf-typetools-2.101.orig/t1dotlessj/t1dotlessj.cc 2014-05-23 22:17:05.000000000 +0200
++++ lcdf-typetools-2.101/t1dotlessj/t1dotlessj.cc 2014-06-17 12:55:35.000000000 +0200
+@@ -410,10 +410,10 @@
// write it to output
if (!outputf)
outputf = stdout;
@@ -68,10 +68,10 @@ 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.100.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.100/t1rawafm/t1rawafm.cc
---- lcdf-typetools-2.100.orig/t1rawafm/t1rawafm.cc 2013-08-13 22:26:12.000000000 +0200
-+++ lcdf-typetools-2.100/t1rawafm/t1rawafm.cc 2014-01-09 12:47:42.000000000 +0100
-@@ -352,6 +352,9 @@
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.101/t1rawafm/t1rawafm.cc
+--- lcdf-typetools-2.101.orig/t1rawafm/t1rawafm.cc 2014-05-23 22:17:05.000000000 +0200
++++ lcdf-typetools-2.101/t1rawafm/t1rawafm.cc 2014-06-17 12:55:35.000000000 +0200
+@@ -356,6 +356,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.100.orig/t1reencode/t1reencode.cc lcdf-typetools-2.100/t1reencode/t1reencode.cc
---- lcdf-typetools-2.100.orig/t1reencode/t1reencode.cc 2013-08-13 22:26:12.000000000 +0200
-+++ lcdf-typetools-2.100/t1reencode/t1reencode.cc 2014-01-09 12:47:42.000000000 +0100
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/t1reencode/t1reencode.cc lcdf-typetools-2.101/t1reencode/t1reencode.cc
+--- lcdf-typetools-2.101.orig/t1reencode/t1reencode.cc 2013-08-13 22:20:37.000000000 +0200
++++ lcdf-typetools-2.101/t1reencode/t1reencode.cc 2014-06-17 12:55:35.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.100.orig/t1testpage/t1testpage.cc lcdf-typetools-2.100/t1testpage/t1testpage.cc
---- lcdf-typetools-2.100.orig/t1testpage/t1testpage.cc 2013-08-13 22:26:12.000000000 +0200
-+++ lcdf-typetools-2.100/t1testpage/t1testpage.cc 2014-01-09 12:47:42.000000000 +0100
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/t1testpage/t1testpage.cc lcdf-typetools-2.101/t1testpage/t1testpage.cc
+--- lcdf-typetools-2.101.orig/t1testpage/t1testpage.cc 2013-08-13 22:20:45.000000000 +0200
++++ lcdf-typetools-2.101/t1testpage/t1testpage.cc 2014-06-17 12:55:35.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.100-PATCHES/patch-21-TL-paths b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/patch-21-TL-paths
index a4adb60f880..66d49e3f125 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-21-TL-paths
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-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.100.orig/otftotfm/automatic.cc lcdf-typetools-2.100/otftotfm/automatic.cc
---- lcdf-typetools-2.100.orig/otftotfm/automatic.cc 2014-01-09 12:47:42.000000000 +0100
-+++ lcdf-typetools-2.100/otftotfm/automatic.cc 2014-01-09 12:51:58.000000000 +0100
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/otftotfm/automatic.cc lcdf-typetools-2.101/otftotfm/automatic.cc
+--- lcdf-typetools-2.101.orig/otftotfm/automatic.cc 2014-06-17 12:55:35.000000000 +0200
++++ lcdf-typetools-2.101/otftotfm/automatic.cc 2014-06-17 13:01:17.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.100-PATCHES/patch-30-W32TeX b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-PATCHES/patch-30-W32TeX
index 289e2d6274e..01dececfde2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100-PATCHES/patch-30-W32TeX
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101-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.100.orig/otftotfm/automatic.cc lcdf-typetools-2.100/otftotfm/automatic.cc
---- lcdf-typetools-2.100.orig/otftotfm/automatic.cc 2014-01-09 12:51:58.000000000 +0100
-+++ lcdf-typetools-2.100/otftotfm/automatic.cc 2014-01-09 12:53:42.000000000 +0100
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/otftotfm/automatic.cc lcdf-typetools-2.101/otftotfm/automatic.cc
+--- lcdf-typetools-2.101.orig/otftotfm/automatic.cc 2014-06-17 13:01:17.000000000 +0200
++++ lcdf-typetools-2.101/otftotfm/automatic.cc 2014-06-17 13:04:34.000000000 +0200
@@ -39,6 +39,10 @@
#include <algorithm>
@@ -49,9 +49,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
+ CMD_SEP " updmap" + redirect;
int retval = mysystem(command.c_str(), errh);
if (retval == 127)
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.100.orig/otftotfm/kpseinterface.c lcdf-typetools-2.100/otftotfm/kpseinterface.c
---- lcdf-typetools-2.100.orig/otftotfm/kpseinterface.c 2014-01-09 12:04:52.000000000 +0100
-+++ lcdf-typetools-2.100/otftotfm/kpseinterface.c 2014-01-09 12:53:42.000000000 +0100
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/otftotfm/kpseinterface.c lcdf-typetools-2.101/otftotfm/kpseinterface.c
+--- lcdf-typetools-2.101.orig/otftotfm/kpseinterface.c 2014-01-09 17:27:02.000000000 +0100
++++ lcdf-typetools-2.101/otftotfm/kpseinterface.c 2014-06-17 13:04:34.000000000 +0200
@@ -21,6 +21,9 @@
#include <kpathsea/expand.h>
#include <kpathsea/c-pathch.h>
@@ -74,9 +74,9 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
+ return kpse_var_value(name);
+}
+#endif
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.100.orig/otftotfm/kpseinterface.h lcdf-typetools-2.100/otftotfm/kpseinterface.h
---- lcdf-typetools-2.100.orig/otftotfm/kpseinterface.h 2013-08-13 22:26:12.000000000 +0200
-+++ lcdf-typetools-2.100/otftotfm/kpseinterface.h 2014-01-09 12:53:42.000000000 +0100
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/otftotfm/kpseinterface.h lcdf-typetools-2.101/otftotfm/kpseinterface.h
+--- lcdf-typetools-2.101.orig/otftotfm/kpseinterface.h 2013-08-13 22:12:16.000000000 +0200
++++ lcdf-typetools-2.101/otftotfm/kpseinterface.h 2014-06-17 13:04:34.000000000 +0200
@@ -13,6 +13,10 @@
char* kpsei_find_file(const char* name, int format);
void kpsei_set_debug_flags(unsigned flags);
@@ -88,9 +88,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.100.orig/otftotfm/otftotfm.cc lcdf-typetools-2.100/otftotfm/otftotfm.cc
---- lcdf-typetools-2.100.orig/otftotfm/otftotfm.cc 2014-01-09 12:47:42.000000000 +0100
-+++ lcdf-typetools-2.100/otftotfm/otftotfm.cc 2014-01-09 12:53:42.000000000 +0100
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.101.orig/otftotfm/otftotfm.cc lcdf-typetools-2.101/otftotfm/otftotfm.cc
+--- lcdf-typetools-2.101.orig/otftotfm/otftotfm.cc 2014-06-17 12:55:35.000000000 +0200
++++ lcdf-typetools-2.101/otftotfm/otftotfm.cc 2014-06-17 13:04:34.778663688 +0200
@@ -63,6 +63,9 @@
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/7t.enc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/7t.enc
index 727f29e5f8c..727f29e5f8c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/7t.enc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/7t.enc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/COPYING b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/COPYING
index 67572846722..67572846722 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/COPYING
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/COPYING
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/INSTALL b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/INSTALL
index 95d84c820fb..95d84c820fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/INSTALL
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/INSTALL
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/Makefile.am
index de0535c5252..de0535c5252 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/Makefile.in
index 20669025053..e6ffee79716 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/Makefile.in
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = lcdf-typetools-2.100
+subdir = lcdf-typetools-2.101
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am COPYING \
INSTALL NEWS README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -418,9 +418,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.100/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/NEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/NEWS
index 4172c8d044b..949f8544610 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/NEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/NEWS
@@ -1,5 +1,18 @@
LCDF Typetools NEWS
+Version 2.101 16.Jun.2014
+
+* otftotfm: Handle fonts with unexpected transformation matrices,
+ such as CFF fonts with 2048 units per em.
+
+* otftotfm: Add --x-height option.
+
+* otftotfm: Handle more TrueType fonts by fixing otftotfm bugs and
+ compensating for some TTF bugs.
+
+* Thanks to Bob Tennent and Marc Penninga.
+
+
Version 2.100 8.Jan.2014
* otftotfm: On some fonts, ligature handling could enter an infinite
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ONEWS b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ONEWS
index 6bd9dc8c42d..6bd9dc8c42d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ONEWS
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ONEWS
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/README b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/README
index d9c7aaa409c..d9c7aaa409c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/README
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/README
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/autoconf.h.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/autoconf.h.in
index 80ecc21618f..e85d1263fd1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/autoconf.h.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/autoconf.h.in
@@ -190,6 +190,9 @@
/* kpsewhich's $SELFAUTODIR variable */
#undef SELFAUTODIR
+/* kpsewhich's $SELFAUTOGRANDPARENT variable */
+#undef SELFAUTOGRANDPARENT
+
/* kpsewhich's $SELFAUTOLOC variable */
#undef SELFAUTOLOC
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/Makefile.am
index 8f63f7a06e8..8f63f7a06e8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/Makefile.in
index 69a11c63917..82fbac94695 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = cfftot1$(EXEEXT)
-subdir = lcdf-typetools-2.100/cfftot1
+subdir = lcdf-typetools-2.101/cfftot1
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -373,9 +373,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.100/cfftot1/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/cfftot1/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/cfftot1/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/cfftot1.1
index c4b9010fc34..c4b9010fc34 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/cfftot1.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/cfftot1.1
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/cfftot1.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/cfftot1.cc
index b0938909599..e4d37e59ec9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/cfftot1.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/cfftot1.cc
@@ -1,6 +1,6 @@
/* cfftot1.cc -- driver for translating CFF fonts to Type 1 fonts
*
- * Copyright (c) 2002-2013 Eddie Kohler
+ * Copyright (c) 2002-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -143,10 +143,14 @@ do_file(const char *infn, const char *outfn, PermString name, ErrorHandler *errh
ContextErrorHandler cerrh(errh, "While processing %s:", infn);
cerrh.set_indent(0);
String data = sa.take_string();
- if (c == 'O')
- data = Efont::OpenType::Font(data, &cerrh).table("CFF");
+ unsigned units_per_em = 0;
+ if (c == 'O') {
+ Efont::OpenType::Font font(data, &cerrh);
+ data = font.table("CFF");
+ units_per_em = font.units_per_em();
+ }
- Cff *cff = new Cff(data, &cerrh);
+ Cff *cff = new Cff(data, units_per_em, &cerrh);
Cff::FontParent *fp = cff->font(name, &cerrh);
if (errh->nerrors() == 0
&& !(font = dynamic_cast<Cff::Font *>(fp)))
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/maket1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/maket1font.cc
index ff17b98b5d9..ff17b98b5d9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/maket1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/maket1font.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/maket1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/maket1font.hh
index 75f2527897f..75f2527897f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/cfftot1/maket1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/cfftot1/maket1font.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/configure.ac b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/configure.ac
index 7334c0a6012..2e37bbea880 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/configure.ac
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/configure.ac
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([lcdf-typetools], [2.100])
+AC_INIT([lcdf-typetools], [2.101])
AC_CONFIG_SRCDIR([NEWS])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([autoconf.h])
@@ -421,10 +421,10 @@ AC_ARG_ENABLE([selfauto-set],
if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno; then
kpsewhich='kpsewhich'
test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich"
- SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null`
- SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null`
- SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null`
- SELFAUTOGRANDPARENT=`$kpsewhich --expand-var='$SELFAUTOGRANDPARENT' 2>/dev/null`
+ SELFAUTOLOC="`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null`"
+ SELFAUTODIR="`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null`"
+ SELFAUTOPARENT="`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null`"
+ SELFAUTOGRANDPARENT="`$kpsewhich --expand-var='$SELFAUTOGRANDPARENT' 2>/dev/null`"
if test -z "$SELFAUTODIR"; then
AC_MSG_WARN([
=========================================
@@ -438,8 +438,8 @@ Either supply the correct PREFIX to --with-kpathsea, or supply
AC_DEFINE_UNQUOTED([SELFAUTOLOC], "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable])
AC_DEFINE_UNQUOTED([SELFAUTODIR], "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable])
AC_DEFINE_UNQUOTED([SELFAUTOPARENT], "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable])
- if test -n "$SELFAUTOGRANDPARENT"; then
- AC_DEFINE_UNQUOTED([SELFAUTOGRANDPARENT], "$SELFAUTOGRANDPARENT", [kpsewhich's $SELFAUTOGRANDPARENT variable])
+ if test -n "$SELFAUTOGRANDPARENT" -a "$SELFAUTOGRANDPARENT" != '$SELFAUTOGRANDPARENT'; then
+ AC_DEFINE_UNQUOTED([SELFAUTOGRANDPARENT], "$SELFAUTOGRANDPARENT", [kpsewhich's $SELFAUTOGRANDPARENT variable])
fi
fi
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/glyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/glyphlist.txt
index 0304ffc6674..0304ffc6674 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/glyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/glyphlist.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/glyphtounicode.tex b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/glyphtounicode.tex
index adaf8c82fc1..adaf8c82fc1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/glyphtounicode.tex
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/glyphtounicode.tex
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/config.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/config.h
index 26a90a97b14..26a90a97b14 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/config.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/config.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/afm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/afm.hh
index f462e0079a4..f462e0079a4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/afm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/afm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/afmparse.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/afmparse.hh
index c29d990ceab..c29d990ceab 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/afmparse.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/afmparse.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/afmw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/afmw.hh
index 4eda701b688..4eda701b688 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/afmw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/afmw.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/amfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/amfm.hh
index 6cc1db90b6e..6cc1db90b6e 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/amfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/amfm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/cff.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/cff.hh
index f965bd60c07..3035fe76a60 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/cff.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/cff.hh
@@ -18,7 +18,8 @@ class Cff { public:
class CIDFont;
class ChildFont;
- Cff(const String &, ErrorHandler * = 0);
+ explicit Cff(const String& str, unsigned units_per_em,
+ ErrorHandler* errh = 0);
~Cff();
bool ok() const { return _error >= 0; }
@@ -41,6 +42,8 @@ class Cff { public:
int ngsubrs() const { return _gsubrs_index.nitems(); }
Charstring *gsubr(int i);
+ unsigned units_per_em() const { return _units_per_em; }
+
enum DictOperator {
oVersion = 0, oNotice = 1, oFullName = 2, oFamilyName = 3,
oWeight = 4, oFontBBox = 5, oBlueValues = 6, oOtherBlues = 7,
@@ -80,8 +83,11 @@ class Cff { public:
int error() const { return (_offsize < 0 ? _offsize : 0); }
+ typedef bool (IndexIterator::*unspecified_bool_type)() const;
bool live() const { return _offset < _last_offset; }
- operator bool() const { return live(); }
+ operator unspecified_bool_type() const {
+ return live() ? &IndexIterator::live : 0;
+ }
int nitems() const;
inline const uint8_t *operator*() const;
@@ -121,6 +127,8 @@ class Cff { public:
IndexIterator _gsubrs_index;
Vector<Charstring *> _gsubrs_cs;
+ unsigned _units_per_em;
+
int parse_header(ErrorHandler *);
int font_offset(int, int &, int &) const;
int font_offset(PermString, int &, int &) const;
@@ -215,7 +223,7 @@ class Cff::FDSelect { public:
class Cff::FontParent : public CharstringProgram { public:
- FontParent(Cff *);
+ FontParent(Cff* cff);
bool ok() const { return _error >= 0; }
int error() const { return _error; }
@@ -227,7 +235,7 @@ class Cff::FontParent : public CharstringProgram { public:
private:
- Cff *_cff;
+ Cff* _cff;
int _charstring_type;
int _error;
@@ -244,7 +252,7 @@ class Cff::FontParent : public CharstringProgram { public:
class Cff::CIDFont : public Cff::FontParent { public:
- CIDFont(Cff *, PermString, const Dict &, ErrorHandler *);
+ CIDFont(Cff* cff, PermString, const Dict &, ErrorHandler *);
~CIDFont();
PermString font_name() const { return _font_name; }
@@ -285,7 +293,7 @@ class Cff::CIDFont : public Cff::FontParent { public:
class Cff::ChildFont : public Cff::FontParent { public:
- ChildFont(Cff *, Cff::CIDFont *, int charstring_type, const Dict &, ErrorHandler * = 0);
+ ChildFont(Cff* cff, Cff::CIDFont *, int charstring_type, const Dict &, ErrorHandler * = 0);
~ChildFont();
bool ok() const { return _error >= 0; }
@@ -333,7 +341,7 @@ class Cff::ChildFont : public Cff::FontParent { public:
class Cff::Font : public Cff::ChildFont { public:
- Font(Cff *, PermString, const Dict &, ErrorHandler *);
+ Font(Cff* cff, PermString, const Dict &, ErrorHandler *);
~Font();
PermString font_name() const { return _font_name; }
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/encoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/encoding.hh
index fd8d749acec..fd8d749acec 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/encoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/encoding.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/findmet.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/findmet.hh
index 74b3ecee141..74b3ecee141 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/findmet.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/findmet.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/metrics.hh
index 21a5f1796fb..21a5f1796fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otf.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otf.hh
index c7ea95a813d..b8fb5c50e05 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otf.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otf.hh
@@ -18,8 +18,13 @@ class Tag {
Tag(const String &name);
// default destructor
+ static Tag head_tag() { return Tag(0x68656164U); }
+
+ typedef bool (Tag::*unspecified_bool_type)() const;
bool null() const { return _tag == 0; }
- operator bool() const { return _tag != 0; }
+ operator unspecified_bool_type() const {
+ return _tag != 0 ? &Tag::null : 0;
+ }
bool valid() const;
uint32_t value() const { return _tag; }
@@ -37,19 +42,25 @@ class Tag {
uint32_t _tag;
};
+inline hashcode_t hashcode(const Tag& t) {
+ return t.value();
+}
+
class Font {
public:
- Font(const String&, ErrorHandler* = 0);
+ Font(const String& str, ErrorHandler* errh = 0);
// default destructor
bool ok() const { return _error >= 0; }
- bool check_checksums(ErrorHandler * = 0) const;
+ bool check_checksums(ErrorHandler* errh = 0) const;
int error() const { return _error; }
const String& data_string() const { return _str; }
const uint8_t* data() const { return _str.udata(); }
int length() const { return _str.length(); }
+ unsigned units_per_em() const { return _units_per_em; }
+
int ntables() const;
bool has_table(Tag tag) const;
String table(Tag tag) const;
@@ -65,6 +76,7 @@ class Font {
private:
String _str;
int _error;
+ unsigned _units_per_em;
int parse_header(ErrorHandler*);
};
@@ -356,8 +368,4 @@ inline bool GlyphSet::operator[](Glyph g) const {
} // namespace Efont::OpenType
} // namespace Efont
-inline hashcode_t hashcode(Efont::OpenType::Tag t) {
- return t.value();
-}
-
#endif
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfcmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfcmap.hh
index f95a3dc5c41..3ac7f49f9cd 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfcmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfcmap.hh
@@ -37,6 +37,7 @@ class Cmap { public:
int check_table(int t, ErrorHandler * = 0) const;
Glyph map_table(int t, uint32_t, ErrorHandler * = 0) const;
void dump_table(int t, Vector<uint32_t> &g2c, ErrorHandler * = 0) const;
+ inline const uint8_t* table_data(int t) const;
};
@@ -51,5 +52,10 @@ inline void Cmap::unmap_all(Vector<uint32_t> &g2c) const
dump_table(USE_FIRST_UNICODE_TABLE, g2c, ErrorHandler::default_handler());
}
+inline const uint8_t* Cmap::table_data(int t) const {
+ const uint8_t* data = _str.udata();
+ return data + Data::u32_aligned(data + HEADER_SIZE + t * ENCODING_SIZE + 4);
+}
+
}}
#endif
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfdata.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfdata.hh
index cdc004ce044..a78e068bcb3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfdata.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfdata.hh
@@ -67,7 +67,7 @@ class Data {
operator const String&() const { return _str; }
- operator bool() const { return _str; }
+ operator String::unspecified_bool_type() const { return _str; }
const uint8_t *udata() const { return _str.udata(); }
int length() const { return _str.length(); }
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfgpos.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfgpos.hh
index 84de5a2126b..84de5a2126b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfgpos.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfgpos.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfgsub.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfgsub.hh
index 98a2e0f945a..98a2e0f945a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfgsub.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfgsub.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfname.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfname.hh
index 42f08e614be..42f08e614be 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfname.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfname.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfos2.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfos2.hh
index db26b674522..db26b674522 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfos2.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfos2.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfpost.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfpost.hh
index 58651583fcb..58651583fcb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/otfpost.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/otfpost.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/pairop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/pairop.hh
index bbb42073e44..bbb42073e44 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/pairop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/pairop.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/psres.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/psres.hh
index ee302821fdb..ee302821fdb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/psres.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/psres.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1bounds.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1bounds.hh
index c5e50634f4c..a96707f7bc4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1bounds.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1bounds.hh
@@ -30,11 +30,13 @@ class CharstringBounds : public CharstringInterp { public:
void clear();
bool char_bounds(const CharstringContext&, bool shift = true);
void translate(double dx, double dy);
- inline Point transform(const Point &) const;
- bool output(int bb[4], int& width, bool use_cur_width = false) const;
+ inline Point transform(const Point& p) const;
+ bool output(double bb[4], double& width, bool use_cur_width = false) const;
- static bool bounds(const CharstringContext&, int bounds[4], int& width);
- static bool bounds(const Transform&, const CharstringContext&, int bounds[4], int& width);
+ static bool bounds(const CharstringContext&,
+ double bounds[4], double& width);
+ static bool bounds(const Transform&, const CharstringContext&,
+ double bounds[4], double& width);
private:
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1cs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1cs.hh
index 1a3f8e8f039..04e17bd6c1d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1cs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1cs.hh
@@ -138,7 +138,7 @@ class Type1Charstring : public Charstring { public:
inline const uint8_t *data() const;
int length() const { return _s.length(); }
- operator bool() const { return _s.length() != 0; }
+ operator String::unspecified_bool_type() const { return _s; }
inline const String &data_string() const;
inline String substring(int pos, int len) const;
@@ -184,7 +184,9 @@ struct CharstringContext {
CharstringContext(const CharstringProgram *program_, const Charstring *cs_) : program(program_), cs(cs_) { }
- operator bool() const { return cs != 0; }
+ operator String::unspecified_bool_type() const {
+ return cs != 0 ? &String::length : 0;
+ }
const CharstringProgram *program;
const Charstring *cs;
@@ -194,12 +196,12 @@ struct CharstringContext {
class CharstringProgram { public:
- CharstringProgram() : _parent_program(false) { }
+ explicit CharstringProgram(unsigned units_per_em);
virtual ~CharstringProgram() { }
virtual PermString font_name() const { return PermString(); }
virtual void font_matrix(double[6]) const;
- virtual int units_per_em() const;
+ unsigned units_per_em() const { return _units_per_em; }
inline const CharstringProgram *program(int) const;
virtual const CharstringProgram *child_program(int) const;
@@ -239,6 +241,7 @@ class CharstringProgram { public:
private:
bool _parent_program;
+ uint16_t _units_per_em;
};
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1csgen.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1csgen.hh
index 226497a4a6b..226497a4a6b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1csgen.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1csgen.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1font.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1font.hh
index 4ec827e7e24..4ec827e7e24 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1font.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1font.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1interp.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1interp.hh
index 0b693b08c70..0b693b08c70 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1interp.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1interp.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1item.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1item.hh
index 056ba0e71d4..056ba0e71d4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1item.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1item.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1mm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1mm.hh
index bf2e81a00e9..bf2e81a00e9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1mm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1mm.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1rw.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1rw.hh
index d59f4089742..d59f4089742 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1rw.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1rw.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1unparser.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1unparser.hh
index 3a6e446e3c7..3a6e446e3c7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/t1unparser.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/t1unparser.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/ttfcs.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/ttfcs.hh
index a2c04461872..96758435603 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/ttfcs.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/ttfcs.hh
@@ -11,7 +11,7 @@ class TrueTypeBoundsCharstringProgram : public CharstringProgram { public:
TrueTypeBoundsCharstringProgram(const OpenType::Font *);
~TrueTypeBoundsCharstringProgram();
- int units_per_em() const;
+ void font_matrix(double[6]) const;
int nglyphs() const;
Charstring *glyph(int gi) const;
@@ -24,11 +24,10 @@ class TrueTypeBoundsCharstringProgram : public CharstringProgram { public:
int _nglyphs;
int _nhmtx;
bool _loca_long;
- int _units_per_em;
OpenType::Data _loca;
OpenType::Data _glyf;
OpenType::Data _hmtx;
- mutable Vector<Charstring *> _charstrings;
+ mutable Vector<Charstring*> _charstrings;
mutable Vector<PermString> _glyph_names;
mutable bool _got_glyph_names;
mutable Vector<uint32_t> _unicodes;
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/ttfhead.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/ttfhead.hh
index 2611a405b1b..2611a405b1b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/ttfhead.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/ttfhead.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/ttfkern.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/ttfkern.hh
index 717a72b6912..717a72b6912 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/efont/ttfkern.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/efont/ttfkern.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/bezier.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/bezier.hh
index ebb93ce9aea..ebb93ce9aea 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/bezier.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/bezier.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/clp.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/clp.h
index d766ccca60a..d766ccca60a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/clp.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/clp.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/error.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/error.hh
index 2af4a77763d..2af4a77763d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/error.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/error.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/filename.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/filename.hh
index 9424a4c04fa..9424a4c04fa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/filename.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/filename.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/globmatch.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/globmatch.hh
index 963035e0ead..963035e0ead 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/globmatch.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/globmatch.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/hashcode.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/hashcode.hh
index 53a0e428989..53a0e428989 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/hashcode.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/hashcode.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/hashmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/hashmap.cc
index 4851463c560..4851463c560 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/hashmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/hashmap.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/hashmap.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/hashmap.hh
index 3d4179e5b5f..3d4179e5b5f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/hashmap.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/hashmap.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/inttypes.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/inttypes.h
index b88e9e9faf0..b88e9e9faf0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/inttypes.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/inttypes.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/landmark.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/landmark.hh
index 183ab936ee8..183ab936ee8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/landmark.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/landmark.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/md5.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/md5.h
index 7d7f8641d23..7d7f8641d23 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/md5.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/md5.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/permstr.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/permstr.hh
index 684878ed464..684878ed464 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/permstr.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/permstr.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/point.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/point.hh
index aad59b53ccf..aad59b53ccf 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/point.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/point.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/slurper.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/slurper.hh
index 2e400d3c3f2..2e400d3c3f2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/slurper.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/slurper.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/straccum.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/straccum.hh
index f62c2984978..f62c2984978 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/straccum.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/straccum.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/string.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/string.hh
index ad83d7cb496..2aba859caa4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/string.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/string.hh
@@ -190,6 +190,14 @@ class String { public:
return _r.data + _r.length;
}
+ inline const unsigned char* ubegin() const {
+ return reinterpret_cast<const unsigned char*>(_r.data);
+ }
+
+ inline const unsigned char* uend() const {
+ return reinterpret_cast<const unsigned char*>(_r.data + _r.length);
+ }
+
typedef int (String::*unspecified_bool_type)() const;
/** @brief Return true iff the string is nonempty. */
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/strtonum.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/strtonum.h
index ee8745a4a42..ee8745a4a42 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/strtonum.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/strtonum.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/transform.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/transform.hh
index 496658a4911..f624d6d6977 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/transform.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/transform.hh
@@ -23,8 +23,10 @@ class Transform { public:
void rotate(double);
void translate(double, double);
void translate(const Point &p) { translate(p.x, p.y); }
+ void raw_translate(double, double);
+ void raw_translate(const Point& p) { raw_translate(p.x, p.y); }
void shear(double);
- inline void transform(const Transform &);
+ Transform& operator*=(const Transform& x);
inline Transform scaled(double, double) const;
Transform scaled(const Point &p) const { return scaled(p.x, p.y); }
@@ -33,7 +35,6 @@ class Transform { public:
inline Transform translated(double, double) const;
inline Transform translated(const Point &p) const;
inline Transform sheared(double) const;
- Transform transformed(const Transform &) const;
// Transform operator+(Transform, const Point &);
// Transform &operator+=(Transform &, const Point &);
@@ -119,29 +120,12 @@ operator*=(Transform &t, double scale)
return t;
}
-inline Transform
-operator*(Transform t, double scale)
-{
+inline Transform operator*(Transform t, double scale) {
return t *= scale;
}
-inline Transform
-operator*(const Transform &t, const Transform &tt)
-{
- return t.transformed(tt);
-}
-
-inline Transform &
-operator*=(Transform &t, const Transform &tt)
-{
- t = t.transformed(tt);
- return t;
-}
-
-inline void
-Transform::transform(const Transform &t)
-{
- *this *= t;
+inline Transform operator*(Transform a, const Transform& b) {
+ return a *= b;
}
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/vector.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/vector.cc
index 8ad11c18810..8ad11c18810 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/vector.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/vector.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/vector.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/vector.hh
index 86e64e238ba..86e64e238ba 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/include/lcdf/vector.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/include/lcdf/vector.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/lcdf-typetools.spec
index baddd4295ce..baddd4295ce 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/lcdf-typetools.spec
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/lcdf-typetools.spec
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/Makefile.am
index a783e28e640..a783e28e640 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/Makefile.in
index ed696f5b2f0..1cff883c8d4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/Makefile.in
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = lcdf-typetools-2.100/libefont
+subdir = lcdf-typetools-2.101/libefont
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -369,9 +369,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.100/libefont/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/libefont/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/libefont/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/libefont/afm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/afm.cc
index 9705f91c97f..9705f91c97f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/afm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/afm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/afmparse.cc
index 313b63ec362..313b63ec362 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/afmparse.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/afmparse.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/afmw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/afmw.cc
index 20840be1332..20840be1332 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/afmw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/afmw.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/amfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/amfm.cc
index b38532d55fb..b38532d55fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/amfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/amfm.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/cff.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/cff.cc
index 9040178f81c..61d626b8a8a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/cff.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/cff.cc
@@ -2,7 +2,7 @@
/* cff.{cc,hh} -- Compact Font Format fonts
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -332,7 +332,8 @@ default_dict()
static Cff *cff;
static Cff::Font *cfffont;
if (!cfffont) {
- cff = new Cff(String::make_stable((const char *) default_dict_cff_data, sizeof(default_dict_cff_data)), ErrorHandler::default_handler());
+ cff = new Cff(String::make_stable((const char *) default_dict_cff_data, sizeof(default_dict_cff_data)),
+ 0, ErrorHandler::default_handler());
cfffont = (Cff::Font *) cff->font();
}
return cfffont->top_dict();
@@ -342,9 +343,9 @@ default_dict()
#define POS_GT(pos1, pos2) ((unsigned)(pos1) > (unsigned)(pos2))
-Cff::Cff(const String &s, ErrorHandler *errh)
+Cff::Cff(const String& s, unsigned units_per_em, ErrorHandler* errh)
: _data_string(s), _data(reinterpret_cast<const uint8_t *>(_data_string.data())), _len(_data_string.length()),
- _strings_map(-2)
+ _strings_map(-2), _units_per_em(units_per_em)
{
static_assert((sizeof(standard_strings) / sizeof(standard_strings[0])) == NSTANDARD_STRINGS,
"NSTANDARD_STRINGS defined incorrectly");
@@ -1203,8 +1204,8 @@ handle_private(Cff *cff, const Cff::Dict &top_dict, Cff::Dict &private_dict,
}
-Cff::FontParent::FontParent(Cff *cff)
- : _cff(cff), _error(-1)
+Cff::FontParent::FontParent(Cff* cff)
+ : CharstringProgram(cff->units_per_em()), _cff(cff), _error(-1)
{
}
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/encoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/encoding.cc
index a55ecc4db25..a55ecc4db25 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/encoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/encoding.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/findmet.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/findmet.cc
index aa5b8167156..aa5b8167156 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/findmet.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/findmet.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/metrics.cc
index 0dd308056e2..0dd308056e2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/metrics.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otf.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otf.cc
index ae099f86fff..6213e1fe3e0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otf.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otf.cc
@@ -25,13 +25,14 @@
#include <algorithm>
#include <efont/otfdata.hh> // for ntohl()
#include <efont/otfname.hh>
+#include <efont/ttfhead.hh>
namespace Efont { namespace OpenType {
Vector<PermString> debug_glyph_names;
-Font::Font(const String &s, ErrorHandler *errh)
- : _str(s) {
+Font::Font(const String& s, ErrorHandler* errh)
+ : _str(s), _units_per_em(0) {
_str.align(4);
_error = parse_header(errh ? errh : ErrorHandler::silent_handler());
}
@@ -73,6 +74,10 @@ Font::parse_header(ErrorHandler *errh)
return errh->error("tags out of order"), -EINVAL;
if (offset + length > (uint32_t) len)
return errh->error("OTF data for %<%s%> out of range", Tag(tag).text().c_str()), -EFAULT;
+ if (Tag::head_tag() == tag) {
+ Head head(_str.substring(offset, length));
+ _units_per_em = head.units_per_em();
+ }
last_tag = tag;
}
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfcmap.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfcmap.cc
index 4a34e47f21f..93b90b3e60a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfcmap.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfcmap.cc
@@ -129,14 +129,12 @@ Cmap::check_table(int t, ErrorHandler *errh) const
t = _first_unicode_table;
if (_error < 0 || t < 0 || t >= _ntables)
return errh->error("no such table");
- if (_table_error[t] > -2)
+ if (_table_error[t] != -2)
return _table_error[t];
_table_error[t] = -1;
- const uint8_t *data = _str.udata();
- uint32_t offset = ULONG_AT(data + HEADER_SIZE + t * ENCODING_SIZE + 4);
- uint32_t left = _str.length() - offset;
- data += offset;
+ const uint8_t *data = table_data(t);
+ uint32_t left = _str.uend() - data;
int format = USHORT_AT(data);
uint32_t length = 0; // value not used
@@ -250,7 +248,7 @@ Cmap::check_table(int t, ErrorHandler *errh) const
}
- _table_error[t] = 0;
+ _table_error[t] = t;
return t;
}
@@ -260,9 +258,7 @@ Cmap::map_table(int t, uint32_t uni, ErrorHandler *errh) const
if ((t = check_table(t, errh)) < 0)
return 0;
- const uint8_t *data = _str.udata();
- data += ULONG_AT(data + HEADER_SIZE + t * ENCODING_SIZE + 4);
-
+ const uint8_t *data = table_data(t);
switch (USHORT_AT(data)) {
case F_BYTE:
@@ -360,9 +356,7 @@ Cmap::dump_table(int t, Vector<uint32_t> &g2c, ErrorHandler *errh) const
if ((t = check_table(t, errh)) < 0)
return;
- const uint8_t *data = _str.udata();
- data += ULONG_AT(data + HEADER_SIZE + t * ENCODING_SIZE + 4);
-
+ const uint8_t *data = table_data(t);
switch (USHORT_AT(data)) {
case F_BYTE:
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfdata.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfdata.cc
index 46c7c885c59..dce769156f9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfdata.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfdata.cc
@@ -2,7 +2,7 @@
/* otfdata.{cc,hh} -- OpenType bounds-checked string type
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfdescrip.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfdescrip.cc
index 307f0b3cb61..307f0b3cb61 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfdescrip.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfdescrip.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfgpos.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfgpos.cc
index eb477256c5c..eb477256c5c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfgpos.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfgpos.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfgsub.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfgsub.cc
index 10597847270..10597847270 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfgsub.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfgsub.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfname.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfname.cc
index ee2151b92ca..ee2151b92ca 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfname.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfname.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfos2.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfos2.cc
index 66ceeba791f..66ceeba791f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfos2.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfos2.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfpost.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfpost.cc
index 9027dd0510a..9027dd0510a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/otfpost.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/otfpost.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/pairop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/pairop.cc
index 5b64be1ac41..5b64be1ac41 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/pairop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/pairop.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/psres.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/psres.cc
index 2136a6b3237..2136a6b3237 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/psres.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/psres.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1bounds.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1bounds.cc
index ccea404d4d3..26a29ac29ff 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1bounds.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1bounds.cc
@@ -2,7 +2,7 @@
/* t1bounds.{cc,hh} -- charstring bounding box finder
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -29,7 +29,7 @@ CharstringBounds::CharstringBounds()
{
}
-CharstringBounds::CharstringBounds(const Transform &nonfont_xf)
+CharstringBounds::CharstringBounds(const Transform& nonfont_xf)
: _lb(UNKDOUBLE, UNKDOUBLE), _rt(UNKDOUBLE, UNKDOUBLE),
_nonfont_xf(nonfont_xf), _last_xf_program(0)
{
@@ -46,6 +46,7 @@ void
CharstringBounds::clear()
{
_lb = _rt = Point(UNKDOUBLE, UNKDOUBLE);
+ _width = Point(0, 0);
}
void
@@ -63,7 +64,7 @@ CharstringBounds::xf_mark(const Bezier &b)
void
CharstringBounds::act_width(int, const Point &w)
{
- _width = w;
+ _width = w * _xf;
}
void
@@ -97,7 +98,7 @@ CharstringBounds::set_xf(const CharstringProgram *program)
_last_xf_program = program;
double matrix[6];
program->font_matrix(matrix);
- Transform font_xf = Transform(matrix).scaled(1000);
+ Transform font_xf = Transform(matrix).scaled(program->units_per_em());
font_xf.check_null(0.001);
_xf = _nonfont_xf * font_xf;
}
@@ -109,8 +110,9 @@ CharstringBounds::char_bounds(const CharstringContext &g, bool shift)
set_xf(g.program);
CharstringInterp::interpret(g);
if (shift) {
- _xf.translate(_width);
- _nonfont_xf.translate(_width);
+ _xf.raw_translate(_width);
+ _nonfont_xf.raw_translate(_width);
+ _width = Point(0, 0);
}
return error() >= 0;
}
@@ -123,27 +125,28 @@ CharstringBounds::translate(double dx, double dy)
}
bool
-CharstringBounds::output(int bb[4], int &width, bool use_cur_width) const
+CharstringBounds::output(double bb[4], double& width, bool use_cur_width) const
{
if (!KNOWN(_lb.x))
bb[0] = bb[1] = bb[2] = bb[3] = 0;
else {
- bb[0] = (int) floor(_lb.x);
- bb[1] = (int) floor(_lb.y);
- bb[2] = (int) ceil(_rt.x);
- bb[3] = (int) ceil(_rt.y);
+ bb[0] = _lb.x;
+ bb[1] = _lb.y;
+ bb[2] = _rt.x;
+ bb[3] = _rt.y;
}
- Point p;
if (use_cur_width)
- p = _width * _xf;
- else
- p = Point(0, 0) * _xf;
- width = (int) ceil(p.x);
+ width = _width.x;
+ else {
+ Point p = Point(0, 0) * _xf;
+ width = p.x;
+ }
return error() >= 0;
}
bool
-CharstringBounds::bounds(const Transform &transform, const CharstringContext &g, int bb[4], int &width)
+CharstringBounds::bounds(const Transform& transform, const CharstringContext& g,
+ double bb[4], double& width)
{
CharstringBounds b(transform);
b.char_bounds(g, false);
@@ -151,7 +154,8 @@ CharstringBounds::bounds(const Transform &transform, const CharstringContext &g,
}
bool
-CharstringBounds::bounds(const CharstringContext &g, int bb[4], int &width)
+CharstringBounds::bounds(const CharstringContext &g,
+ double bb[4], double& width)
{
CharstringBounds b;
b.char_bounds(g, false);
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1cs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1cs.cc
index 4db3afa5a9d..2e58ecd161c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1cs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1cs.cc
@@ -2,7 +2,7 @@
/* t1cs.{cc,hh} -- Type 1/2 charstrings
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -326,6 +326,11 @@ Type2Charstring::process(CharstringInterp &interp) const
}
+CharstringProgram::CharstringProgram(unsigned units_per_em)
+ : _parent_program(false),
+ _units_per_em(units_per_em ? units_per_em : 1000) {
+}
+
const CharstringProgram *
CharstringProgram::child_program(int) const
{
@@ -339,12 +344,6 @@ CharstringProgram::font_matrix(double matrix[6]) const
matrix[1] = matrix[2] = matrix[4] = matrix[5] = 0;
}
-int
-CharstringProgram::units_per_em() const
-{
- return 1000;
-}
-
void
CharstringProgram::glyph_names(Vector<PermString> &gnames) const
{
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1csgen.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1csgen.cc
index b24c8f21307..b24c8f21307 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1csgen.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1csgen.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1font.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1font.cc
index 05b97fa346e..19aacc3c985 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1font.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1font.cc
@@ -2,7 +2,7 @@
/* t1font.{cc,hh} -- Type 1 font
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -31,7 +31,8 @@ static PermString lenIV_str = "lenIV";
static PermString FontInfo_str = "FontInfo";
Type1Font::Type1Font(PermString name)
- : _cached_defs(false), _built(true), _font_name(name), _glyph_map(-1),
+ : CharstringProgram(1000),
+ _cached_defs(false), _built(true), _font_name(name), _glyph_map(-1),
_encoding(0), _cached_mmspace(0), _mmspace(0), _synthetic_item(0)
{
_dict = new HashMap<PermString, Type1Definition *>[dLast];
@@ -43,7 +44,8 @@ Type1Font::Type1Font(PermString name)
}
Type1Font::Type1Font(Type1Reader &reader)
- : _cached_defs(false), _built(false), _glyph_map(-1), _encoding(0),
+ : CharstringProgram(1000),
+ _cached_defs(false), _built(false), _glyph_map(-1), _encoding(0),
_cached_mmspace(0), _mmspace(0), _synthetic_item(0)
{
_dict = new HashMap<PermString, Type1Definition *>[dLast];
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1fontskel.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1fontskel.cc
index e5e48023348..e5e48023348 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1fontskel.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1fontskel.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1interp.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1interp.cc
index 53483f211f8..53483f211f8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1interp.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1interp.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1item.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1item.cc
index 5e169b66f13..5e169b66f13 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1item.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1item.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1mm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1mm.cc
index 404335a8f20..e6fc7dd57d4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1mm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1mm.cc
@@ -2,7 +2,7 @@
/* t1mm.{cc,hh} -- Type 1 multiple master font information
*
- * Copyright (c) 1998-2012 Eddie Kohler
+ * Copyright (c) 1998-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -25,7 +25,8 @@
namespace Efont {
MultipleMasterSpace::MultipleMasterSpace(PermString fn, int na, int nm)
- : _ok(false), _font_name(fn), _naxes(na), _nmasters(nm),
+ : CharstringProgram(1000),
+ _ok(false), _font_name(fn), _naxes(na), _nmasters(nm),
_axis_types(na, PermString()), _axis_labels(na, PermString()),
_design_vector(0), _norm_design_vector(0), _weight_vector(0)
{
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1rw.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1rw.cc
index 846297e6b67..846297e6b67 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1rw.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1rw.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1unparser.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1unparser.cc
index 993253deec9..993253deec9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/t1unparser.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/t1unparser.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/ttfcs.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/ttfcs.cc
index d427cf17bcc..39b3c5325b5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/ttfcs.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/ttfcs.cc
@@ -2,7 +2,7 @@
/* ttfcs.{cc,hh} -- TrueType "charstring" emulation
*
- * Copyright (c) 2006-2012 Eddie Kohler
+ * Copyright (c) 2006-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -24,8 +24,9 @@
#include <lcdf/hashmap.hh>
namespace Efont {
-TrueTypeBoundsCharstringProgram::TrueTypeBoundsCharstringProgram(const OpenType::Font *otf)
- : _otf(otf), _nglyphs(-1), _loca_long(false), _units_per_em(1024),
+TrueTypeBoundsCharstringProgram::TrueTypeBoundsCharstringProgram(const OpenType::Font* otf)
+ : CharstringProgram(otf->units_per_em()),
+ _otf(otf), _nglyphs(-1), _loca_long(false),
_loca(otf->table("loca")), _glyf(otf->table("glyf")),
_hmtx(otf->table("hmtx")), _got_glyph_names(false), _got_unicodes(false)
{
@@ -34,10 +35,8 @@ TrueTypeBoundsCharstringProgram::TrueTypeBoundsCharstringProgram(const OpenType:
_nglyphs = maxp.u16(4);
OpenType::Head head(otf->table("head"), 0);
- if (head.ok()) {
+ if (head.ok())
_loca_long = head.index_to_loc_format() != 0;
- _units_per_em = head.units_per_em();
- }
if (_loca_long)
_loca.align_long();
int loca_onesize = (_loca_long ? 4 : 2);
@@ -77,10 +76,9 @@ TrueTypeBoundsCharstringProgram::~TrueTypeBoundsCharstringProgram()
delete *cs;
}
-int
-TrueTypeBoundsCharstringProgram::units_per_em() const
-{
- return _units_per_em;
+void TrueTypeBoundsCharstringProgram::font_matrix(double matrix[6]) const {
+ matrix[0] = matrix[3] = 1.0 / _otf->units_per_em();
+ matrix[1] = matrix[2] = matrix[4] = matrix[5] = 0;
}
int
@@ -101,9 +99,20 @@ TrueTypeBoundsCharstringProgram::glyph_name(int gi) const
OpenType::Post post(_otf->table("post"));
if (post.ok())
post.glyph_names(_glyph_names);
+ HashMap<PermString, int> name2glyph(-1);
+ // some 'post' tables are bogus, reject multiply-encoded names
+ for (int gi = 0; gi < _glyph_names.size(); ++gi) {
+ int& xgi = name2glyph.find_force(_glyph_names[gi]);
+ if (xgi == -1)
+ xgi = gi;
+ else if (xgi == 0)
+ _glyph_names[gi] = PermString();
+ else
+ _glyph_names[gi] = _glyph_names[xgi] = PermString();
+ }
_got_glyph_names = true;
}
- if (gi >= 0 && gi < _glyph_names.size())
+ if (gi >= 0 && gi < _glyph_names.size() && _glyph_names[gi])
return _glyph_names[gi];
// try 'uniXXXX' names
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/ttfhead.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/ttfhead.cc
index 5be8676c64c..5be8676c64c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/ttfhead.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/ttfhead.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/ttfkern.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/ttfkern.cc
index 824922457ac..824922457ac 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/libefont/ttfkern.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/libefont/ttfkern.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/Makefile.am
index f096b1c41bf..f096b1c41bf 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/Makefile.in
index 1a14e9a1577..e4d02f6c217 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@FIXLIBC_TRUE@am__append_1 = fixlibc.c
-subdir = lcdf-typetools-2.100/liblcdf
+subdir = lcdf-typetools-2.101/liblcdf
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -358,9 +358,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.100/liblcdf/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/liblcdf/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/liblcdf/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/liblcdf/bezier.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/bezier.cc
index 95c8d8b9fb0..95c8d8b9fb0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/bezier.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/bezier.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/clp.c
index a797ac26967..a797ac26967 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/clp.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/clp.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/error.cc
index cfef2f07de9..cfef2f07de9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/error.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/error.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/filename.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/filename.cc
index 396e81cd3c5..396e81cd3c5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/filename.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/filename.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/fixlibc.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/fixlibc.c
index d41238daf85..d41238daf85 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/fixlibc.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/fixlibc.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/globmatch.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/globmatch.cc
index dcd7afc135c..dcd7afc135c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/globmatch.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/globmatch.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/landmark.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/landmark.cc
index 68511055ddc..68511055ddc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/landmark.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/landmark.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/md5.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/md5.c
index c8508865c20..c8508865c20 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/md5.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/md5.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/permstr.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/permstr.cc
index c6aebab31e7..c6aebab31e7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/permstr.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/permstr.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/point.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/point.cc
index 8b23fdcb571..8b23fdcb571 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/point.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/point.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/slurper.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/slurper.cc
index e089617705d..e089617705d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/slurper.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/slurper.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/straccum.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/straccum.cc
index f31b9e216fc..f31b9e216fc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/straccum.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/straccum.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/string.cc
index 3561bca38aa..3561bca38aa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/string.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/string.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/strtonum.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/strtonum.c
index 36898c5a7ad..36898c5a7ad 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/strtonum.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/strtonum.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/transform.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/transform.cc
index 5eb0ff58728..5193cd062d0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/transform.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/transform.cc
@@ -2,7 +2,7 @@
/* transform.{cc,hh} -- planar affine transformations
*
- * Copyright (c) 2000-2012 Eddie Kohler
+ * Copyright (c) 2000-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -99,21 +99,36 @@ Transform::translate(double x, double y)
_null = false;
}
+void Transform::raw_translate(double x, double y) {
+ _m[4] += x;
+ _m[5] += y;
+
+ if (x != 0 || y != 0)
+ _null = false;
+}
+
void
Transform::shear(double s)
{
*this *= Transform(1, 0, s, 1, 0, 0);
}
-Transform
-Transform::transformed(const Transform &t) const
-{
- return Transform(_m[0] * t._m[0] + _m[2] * t._m[1],
- _m[1] * t._m[0] + _m[3] * t._m[1],
- _m[0] * t._m[2] + _m[2] * t._m[3],
- _m[1] * t._m[2] + _m[3] * t._m[3],
- _m[0] * t._m[4] + _m[2] * t._m[5] + _m[4],
- _m[1] * t._m[4] + _m[3] * t._m[5] + _m[5]);
+Transform& Transform::operator*=(const Transform& x) {
+ if (x.null())
+ /* do nothing */;
+ else if (null())
+ memcpy(_m, x._m, sizeof(_m));
+ else {
+ double m[6];
+ m[0] = _m[0] * x._m[0] + _m[2] * x._m[1];
+ m[1] = _m[1] * x._m[0] + _m[3] * x._m[1];
+ m[2] = _m[0] * x._m[2] + _m[2] * x._m[3];
+ m[3] = _m[1] * x._m[2] + _m[3] * x._m[3];
+ m[4] = _m[0] * x._m[4] + _m[2] * x._m[5] + _m[4];
+ m[5] = _m[1] * x._m[4] + _m[3] * x._m[5] + _m[5];
+ memcpy(_m, m, sizeof(_m));
+ }
+ return *this;
}
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/vectorv.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/vectorv.cc
index f5f12b52c90..f5f12b52c90 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/liblcdf/vectorv.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/liblcdf/vectorv.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/m4/lcdf-typetools.m4 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/m4/lcdf-typetools.m4
index 7aaff4c33af..7aaff4c33af 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/m4/lcdf-typetools.m4
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/m4/lcdf-typetools.m4
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/Makefile.am
index acabc098098..acabc098098 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/Makefile.in
index ca173dfc959..3ed21abd6e5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = mmafm$(EXEEXT)
-subdir = lcdf-typetools-2.100/mmafm
+subdir = lcdf-typetools-2.101/mmafm
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -353,9 +353,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.100/mmafm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/mmafm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/mmafm/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/mmafm/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/main.cc
index d3dd50b20b6..d3dd50b20b6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/main.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/mmafm.1
index f307238f599..f307238f599 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmafm/mmafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmafm/mmafm.1
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/Makefile.am
index d1b8d0370d1..d1b8d0370d1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/Makefile.in
index fa69343b2ec..8204e866b5f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = mmpfb$(EXEEXT)
-subdir = lcdf-typetools-2.100/mmpfb
+subdir = lcdf-typetools-2.101/mmpfb
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -376,9 +376,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.100/mmpfb/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/mmpfb/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/mmpfb/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/mmpfb/main.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/main.cc
index 71d4ff3d45d..71d4ff3d45d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/main.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/main.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/mmpfb.1
index c11f656eec4..c11f656eec4 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/mmpfb.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/mmpfb.1
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/myfont.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/myfont.cc
index 1325b44d3e6..1325b44d3e6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/myfont.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/myfont.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/myfont.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/myfont.hh
index ffe35668f94..ffe35668f94 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/myfont.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/myfont.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1minimize.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1minimize.cc
index 2c4b1bcb015..2c4b1bcb015 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1minimize.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1minimize.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1minimize.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1minimize.hh
index a5c3ea04906..a5c3ea04906 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1minimize.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1minimize.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1rewrit.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1rewrit.cc
index 86382ca239b..86382ca239b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1rewrit.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1rewrit.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1rewrit.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1rewrit.hh
index eac9d75beeb..eac9d75beeb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/mmpfb/t1rewrit.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/mmpfb/t1rewrit.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/Makefile.am
index b2f3dbfa52a..b2f3dbfa52a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/Makefile.in
index 13fa7e86933..b9020b04679 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = otfinfo$(EXEEXT)
-subdir = lcdf-typetools-2.100/otfinfo
+subdir = lcdf-typetools-2.101/otfinfo
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -355,9 +355,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.100/otfinfo/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/otfinfo/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/otfinfo/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/otfinfo.1
index 589ff419b2a..04473e0c1ec 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/otfinfo.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/otfinfo.1
@@ -124,10 +124,14 @@ Print the name of every glyph in each font, one per line. For example:
ncommaaccent.end
lje.alt
.fi
-Works for PostScript-flavored OpenType fonts only.
'
.Sp
.TP 5
+.BR \-u ", " \-\-unicode
+Print each Unicode code point supported by the font, followed by the glyph number
+representing that code point (and, if present, the name of the corresponding glyph).
+.Sp
+.TP 5
.BR \-t ", " \-\-tables
Print the size and name of every OpenType table in the font. For example:
.nf
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/otfinfo.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/otfinfo.cc
index a4af422a88a..345b1baf442 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otfinfo/otfinfo.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otfinfo/otfinfo.cc
@@ -1,6 +1,6 @@
/* otfinfo.cc -- driver for reporting information about OpenType fonts
*
- * Copyright (c) 2003-2013 Eddie Kohler
+ * Copyright (c) 2003-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -15,10 +15,12 @@
# include <config.h>
#endif
#include <efont/psres.hh>
+#include <efont/otfcmap.hh>
#include <efont/otfgsub.hh>
#include <efont/otfgpos.hh>
#include <efont/otfname.hh>
#include <efont/otfos2.hh>
+#include <efont/otfpost.hh>
#include <efont/cff.hh>
#include <lcdf/clp.h>
#include <lcdf/error.hh>
@@ -30,6 +32,7 @@
#include <ctype.h>
#include <errno.h>
#include <algorithm>
+#include <utility>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
@@ -56,9 +59,9 @@ using namespace Efont;
#define QUERY_FAMILY_OPT 327
#define INFO_OPT 328
#define DUMP_TABLE_OPT 329
+#define QUERY_UNICODE_OPT 330
const Clp_Option options[] = {
-
{ "script", 0, SCRIPT_OPT, Clp_ValString, 0 },
{ "quiet", 'q', QUIET_OPT, 0, Clp_Negate },
{ "verbose", 'V', VERBOSE_OPT, 0, Clp_Negate },
@@ -72,9 +75,9 @@ const Clp_Option options[] = {
{ "glyphs", 'g', QUERY_GLYPHS_OPT, 0, 0 },
{ "tables", 't', TABLES_OPT, 0, 0 },
{ "dump-table", 'T', DUMP_TABLE_OPT, Clp_ValString, 0 },
+ { "unicode", 'u', QUERY_UNICODE_OPT, 0, 0 },
{ "help", 'h', HELP_OPT, 0, 0 },
{ "version", 0, VERSION_OPT, 0, 0 },
-
};
@@ -422,32 +425,94 @@ do_info(const OpenType::Font &otf, ErrorHandler *errh, ErrorHandler *result_errh
}
static void
-do_query_glyphs(const OpenType::Font &otf, ErrorHandler *errh, ErrorHandler *result_errh)
+do_query_glyphs_cff(const OpenType::Font& otf, ErrorHandler* errh, Vector<PermString>& glyph_names)
{
- int before_nerrors = errh->nerrors();
try {
// get font
- Cff cff(otf.table("CFF"), errh);
+ Cff cff(otf.table("CFF"), otf.units_per_em(), errh);
if (!cff.ok())
- throw OpenType::Error();
+ return;
Cff::FontParent *fp = cff.font(PermString(), errh);
if (!fp || !fp->ok())
- throw OpenType::Error();
+ return;
Cff::Font *font = dynamic_cast<Cff::Font *>(fp);
if (!font) {
errh->error("CID-keyed fonts not supported");
- throw OpenType::Error();
+ return;
}
// save glyph names
- Vector<PermString> glyph_names;
font->glyph_names(glyph_names);
- for (PermString* s = glyph_names.begin(); s < glyph_names.end(); s++)
- result_errh->message("%s", s->c_str());
} catch (OpenType::Error) {
- if (errh->nerrors() == before_nerrors)
- result_errh->message("no glyph name information");
+ }
+}
+
+static void
+do_query_glyphs_post(const OpenType::Font& otf, ErrorHandler* errh, Vector<PermString>& glyph_names)
+{
+ try {
+ // get font
+ OpenType::Post post(otf.table("post"), errh);
+ if (!post.ok())
+ return;
+
+ // save glyph names
+ post.glyph_names(glyph_names);
+ } catch (OpenType::Error) {
+ }
+}
+
+static void
+do_query_glyphs(const OpenType::Font &otf, ErrorHandler *errh, ErrorHandler *result_errh)
+{
+ int before_nerrors = errh->nerrors();
+ Vector<PermString> glyph_names;
+ if (otf.table("CFF"))
+ do_query_glyphs_cff(otf, errh, glyph_names);
+ else if (otf.table("post"))
+ do_query_glyphs_post(otf, errh, glyph_names);
+ for (PermString* s = glyph_names.begin(); s != glyph_names.end(); ++s)
+ result_errh->message("%s", s->c_str());
+ if (glyph_names.empty() && errh->nerrors() == before_nerrors)
+ errh->message("no glyph name information");
+}
+
+static void
+do_query_unicode(const OpenType::Font& otf, ErrorHandler* errh, ErrorHandler* result_errh)
+{
+ Vector<PermString> glyph_names;
+ if (otf.table("CFF"))
+ do_query_glyphs_cff(otf, errh, glyph_names);
+ else if (otf.table("post"))
+ do_query_glyphs_post(otf, errh, glyph_names);
+
+ try {
+ OpenType::Cmap cmap(otf.table("cmap"), errh);
+ if (!cmap.ok())
+ throw OpenType::Error();
+
+ Vector<uint32_t> g2c;
+ cmap.unmap_all(g2c);
+
+ Vector<std::pair<uint32_t, int> > u2g;
+ for (int i = 0; i != g2c.size(); ++i)
+ if (g2c[i])
+ u2g.push_back(std::make_pair(g2c[i], i));
+
+ std::sort(u2g.begin(), u2g.end());
+ for (std::pair<uint32_t, int>* it = u2g.begin(); it != u2g.end(); ++it) {
+ char name[10];
+ if (it->first < 0x10000)
+ sprintf(name, "uni%04X", it->first);
+ else
+ sprintf(name, "u%X", it->first);
+ if ((size_t) it->second < glyph_names.size())
+ result_errh->message("%s %d %s\n", name, it->second, glyph_names[it->second].c_str());
+ else
+ result_errh->message("%s %d\n", name, it->second);
+ }
+ } catch (OpenType::Error) {
}
}
@@ -530,6 +595,7 @@ main(int argc, char *argv[])
case QUERY_GLYPHS_OPT:
case QUERY_FAMILY_OPT:
case QUERY_FVERSION_OPT:
+ case QUERY_UNICODE_OPT:
case TABLES_OPT:
case INFO_OPT:
if (query)
@@ -620,6 +686,8 @@ particular purpose.\n");
do_query_postscript_name(otf, &cerrh, result_errh);
else if (query == QUERY_GLYPHS_OPT)
do_query_glyphs(otf, &cerrh, result_errh);
+ else if (query == QUERY_UNICODE_OPT)
+ do_query_unicode(otf, &cerrh, result_errh);
else if (query == QUERY_FAMILY_OPT)
do_query_family_name(otf, &cerrh, result_errh);
else if (query == QUERY_FVERSION_OPT)
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/Makefile.am
index 7bbb038146d..7bbb038146d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/Makefile.in
index 6fc793f2b05..952de3c38b7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/Makefile.in
@@ -83,7 +83,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.100/otftotfm
+subdir = lcdf-typetools-2.101/otftotfm
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -392,9 +392,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.100/otftotfm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/otftotfm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/otftotfm/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/automatic.cc
index 7ce4e512e84..7ce4e512e84 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/automatic.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/automatic.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/automatic.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/automatic.hh
index 4c973347715..4c973347715 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/automatic.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/automatic.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/dvipsencoding.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/dvipsencoding.cc
index 78b32dabca8..78b32dabca8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/dvipsencoding.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/dvipsencoding.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/dvipsencoding.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/dvipsencoding.hh
index a80631c3038..a80631c3038 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/dvipsencoding.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/dvipsencoding.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/glyphfilter.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/glyphfilter.cc
index a4120660bfc..a4120660bfc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/glyphfilter.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/glyphfilter.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/glyphfilter.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/glyphfilter.hh
index 753e5714d5c..753e5714d5c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/glyphfilter.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/glyphfilter.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/kpseinterface.c b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/kpseinterface.c
index 302dfb20d4c..302dfb20d4c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/kpseinterface.c
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/kpseinterface.c
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/kpseinterface.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/kpseinterface.h
index 413e06e6572..413e06e6572 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/kpseinterface.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/kpseinterface.h
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/metrics.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/metrics.cc
index 1e4d702f74a..1e4d702f74a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/metrics.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/metrics.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/metrics.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/metrics.hh
index 9442c3e456a..9442c3e456a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/metrics.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/metrics.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/otftotfm.1
index b1471686eb8..9c412a2ffed 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/otftotfm.1
@@ -498,6 +498,17 @@ accents. Normally you won't need this option; the font will tell
its italic angle.
.PD
'
+.Sp
+.TP 5
+.BI \-\-x\-height= val
+Set the output font's x-height to
+.IR val .
+This value is used by TeX to position accents. Normally you won't
+need this option.
+.IR Val
+may be a number expressed in font units; \(oqx\(cq, which uses the
+height of the font's lowercase x; or \(oqfont\(cq, which uses the
+font's declared x-height metric.
'
.SS Encoding Options
'
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/otftotfm.cc
index b1d7132e935..05ab2949da0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/otftotfm.cc
@@ -1,6 +1,6 @@
/* otftotfm.cc -- driver for translating OpenType fonts to TeX metrics
*
- * Copyright (c) 2003-2013 Eddie Kohler
+ * Copyright (c) 2003-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -109,6 +109,7 @@ using namespace Efont;
#define FIXED_PITCH_OPT 342
#define ITALIC_ANGLE_OPT 343
#define PROPORTIONAL_WIDTH_OPT 344
+#define X_HEIGHT_OPT 345
#define AUTOMATIC_OPT 350
#define FONT_NAME_OPT 351
@@ -191,6 +192,7 @@ static Clp_Option options[] = {
{ "fixed-width", 0, FIXED_PITCH_OPT, 0, Clp_Negate },
{ "proportional-width", 0, PROPORTIONAL_WIDTH_OPT, 0, Clp_Negate },
{ "italic-angle", 0, ITALIC_ANGLE_OPT, Clp_ValDouble, 0 },
+ { "x-height", 0, X_HEIGHT_OPT, Clp_ValString, 0 },
{ "pl", 'p', PL_OPT, 0, 0 },
{ "virtual", 0, VIRTUAL_OPT, 0, Clp_Negate },
@@ -278,6 +280,8 @@ static bool override_is_fixed_pitch = false;
static bool is_fixed_pitch;
static bool override_italic_angle = false;
static double italic_angle;
+static int override_x_height = FontInfo::x_height_auto;
+static double x_height;
static String out_encoding_file;
static String out_encoding_name;
@@ -338,6 +342,7 @@ Font feature and transformation options:\n\
--design-size=SIZE Set font design size to SIZE.\n\
--fixed-width Set fixed width (no space stretch).\n\
--italic-angle=ANGLE Set font italic angle (for positioning accents).\n\
+ --x-height=AMT Set x-height to AMT units.\n\
\n");
uerrh.message("\
Encoding options:\n\
@@ -514,29 +519,51 @@ lig_context_str(int ctx)
static double max_printed_real;
-static void
-fprint_real(FILE *f, const char *prefix, double value, double du, const char *suffix = ")\n")
-{
- if (du == 1.) {
- fprintf(f, "%s R %g%s", prefix, value, suffix);
- max_printed_real = std::max(max_printed_real, fabs(value));
- } else {
- fprintf(f, "%s R %.4f%s", prefix, value * du, suffix);
- max_printed_real = std::max(max_printed_real, fabs(value * du));
+namespace {
+struct Printer {
+ Printer(FILE* f, unsigned design_units, unsigned units_per_em)
+ : f_(f), du_((double) design_units / units_per_em),
+ round_(design_units == 1000) {
}
+ inline double transform(double value) const;
+ void print_transformed(const char* prefix, double value) const;
+ void print(const char* prefix, double value) const;
+ String render(double value) const;
+ FILE* f_;
+ double du_;
+ bool round_;
+};
+
+inline double Printer::transform(double value) const {
+ value *= du_;
+ if (round_)
+ value = ceil(value);
+ return value;
}
-static String
-real_string(double value, double du)
-{
- if (du == 1.)
+void Printer::print_transformed(const char* prefix, double value) const {
+ if (round_ || value == 0 || (value > 0.01 && value - floor(value) < 0.01))
+ fprintf(f_, "%s R %g)\n", prefix, value);
+ else
+ fprintf(f_, "%s R %.4f)\n", prefix, value);
+ max_printed_real = std::max(max_printed_real, fabs(value));
+}
+
+void Printer::print(const char* prefix, double value) const {
+ print_transformed(prefix, transform(value));
+}
+
+String Printer::render(double value) const {
+ value = transform(value);
+ if (round_ || value == 0 || (value > 0.01 && value - floor(value) < 0.01))
return String(value);
else {
char buf[128];
- sprintf(buf, "%.4f", value * du);
+ sprintf(buf, "%.4f", value);
return String(buf);
}
}
+} // namespace
double
font_slant(const FontInfo &finfo)
@@ -594,8 +621,8 @@ output_pl(Metrics &metrics, const String &ps_name, int boundary_char,
font_xform.scale(extend, 1);
if (slant)
font_xform.shear(slant);
- int bounds[4], width;
- double du = (design_units == metrics.units_per_em() ? 1. : design_units / (double) metrics.units_per_em());
+ double bounds[4], width;
+ Printer pr(f, design_units, metrics.units_per_em());
double actual_slant = font_slant(finfo);
if (actual_slant)
@@ -604,24 +631,24 @@ output_pl(Metrics &metrics, const String &ps_name, int boundary_char,
if (char_bounds(bounds, width, finfo, font_xform, ' ')) {
// advance space width by letterspacing, scale by space_factor
double space_width = (width + (vpl ? letterspace : 0)) * space_factor;
- fprint_real(f, " (SPACE", space_width, du);
+ pr.print(" (SPACE", space_width);
if (finfo.is_fixed_pitch()) {
// fixed-pitch: no space stretch or shrink
- fprint_real(f, " (STRETCH", 0, du);
- fprint_real(f, " (SHRINK", 0, du);
- fprint_real(f, " (EXTRASPACE", space_width, du);
+ pr.print(" (STRETCH", 0);
+ pr.print(" (SHRINK", 0);
+ pr.print(" (EXTRASPACE", space_width);
} else {
- fprint_real(f, " (STRETCH", space_width / 2., du);
- fprint_real(f, " (SHRINK", space_width / 3., du);
- fprint_real(f, " (EXTRASPACE", space_width / 6., du);
+ pr.print(" (STRETCH", space_width / 2.);
+ pr.print(" (SHRINK", space_width / 3.);
+ pr.print(" (EXTRASPACE", space_width / 6.);
}
}
- int xheight = font_x_height(finfo, font_xform);
- if (xheight * du < 1000)
- fprint_real(f, " (XHEIGHT", xheight, du);
+ double x_height = finfo.x_height(font_xform);
+ if (x_height < finfo.units_per_em())
+ pr.print(" (XHEIGHT", x_height);
- fprint_real(f, " (QUAD", finfo.units_per_em(), du);
+ pr.print(" (QUAD", finfo.units_per_em());
fprintf(f, " )\n");
if (boundary_char >= 0)
@@ -730,7 +757,7 @@ output_pl(Metrics &metrics, const String &ps_name, int boundary_char,
double this_kern = kern_amt[k2 - kern_code2.begin()];
if (fabs(this_kern) >= minimum_kern)
kern_sa << " (KRN " << glyph_ids[*k2]
- << " R " << real_string(this_kern, du)
+ << " R " << pr.render(this_kern)
<< ')' << glyph_comments[*k2] << '\n';
}
if (kern_sa) {
@@ -779,9 +806,9 @@ output_pl(Metrics &metrics, const String &ps_name, int boundary_char,
if (vpl)
boundser.translate(s->x + x, s->y + y);
if (s->x + x)
- sa << " (MOVERIGHT R " << real_string(s->x + x, du) << ")\n";
+ sa << " (MOVERIGHT R " << pr.render(s->x + x) << ")\n";
if (s->y + y)
- sa << " (MOVEUP R " << real_string(s->y + y, du) << ")\n";
+ sa << " (MOVEUP R " << pr.render(s->y + y) << ")\n";
break;
}
@@ -791,7 +818,7 @@ output_pl(Metrics &metrics, const String &ps_name, int boundary_char,
boundser.mark(Point(s->x, s->y));
boundser.translate(s->x, 0);
}
- sa << " (SETRULE R " << real_string(s->y, du) << " R " << real_string(s->x, du) << ")\n";
+ sa << " (SETRULE R " << pr.render(s->y) << " R " << pr.render(s->x) << ")\n";
break;
case Setting::FONT:
@@ -841,13 +868,13 @@ output_pl(Metrics &metrics, const String &ps_name, int boundary_char,
// output information
boundser.output(bounds, width);
- fprint_real(f, " (CHARWD", width, du);
+ pr.print(" (CHARWD", width);
if (bounds[3] > 0)
- fprint_real(f, " (CHARHT", bounds[3], du);
+ pr.print(" (CHARHT", bounds[3]);
if (bounds[1] < 0)
- fprint_real(f, " (CHARDP", -bounds[1], du);
+ pr.print(" (CHARDP", -bounds[1]);
if (bounds[2] > width)
- fprint_real(f, " (CHARIC", bounds[2] - width, du);
+ pr.print_transformed(" (CHARIC", pr.transform(bounds[2]) - pr.transform(width));
if (vpl && (settings.size() > 1 || settings[0].op != Setting::SHOW))
fprintf(f, " (MAP\n%s )\n", sa.c_str());
fprintf(f, " )\n");
@@ -1467,22 +1494,24 @@ do_math_spacing(Metrics &metrics, const FontInfo &finfo,
font_xform.shear(slant);
CharstringBounds boundser(font_xform);
- int x_height = font_x_height(finfo, font_xform);
+ double x_height = finfo.x_height(font_xform);
double slant = font_slant(finfo);
int boundary_char = dvipsenc.boundary_char();
- int bounds[4], width;
+ double bounds[4], width;
for (int code = 0; code < metrics.encoding_size(); code++)
if (metrics.was_base_glyph(code) && code != boundary_char
&& char_bounds(bounds, width, finfo, font_xform, code)) {
- int left_sb = (bounds[0] < 0 ? -bounds[0] : 0);
+ int left_sb = (bounds[0] < 0 ? (int) ceil(-bounds[0]) : 0);
metrics.add_single_positioning(code, left_sb, 0, left_sb);
if (skew_char >= 0 && code < 256) {
- double virtual_height = (bounds[3] > x_height ? bounds[3] :x_height) - 0.5 * x_height;
- int right_sb = (bounds[2] > width ? bounds[2] - width : 0);
- int skew = (int)(slant * virtual_height + left_sb - right_sb);
+ double virtual_height =
+ (bounds[3] > x_height ? bounds[3] : x_height)
+ - 0.5 * x_height;
+ double right_sb = (bounds[2] > width ? bounds[2] - width : 0);
+ int skew = (int) (slant * virtual_height + left_sb - right_sb);
metrics.add_kern(code, skew_char, skew);
}
}
@@ -1502,6 +1531,8 @@ do_file(const String &otf_filename, const OpenType::Font &otf,
finfo.set_is_fixed_pitch(is_fixed_pitch);
if (override_italic_angle)
finfo.set_italic_angle(italic_angle);
+ if (override_x_height != FontInfo::x_height_auto)
+ finfo.set_x_height(override_x_height, x_height);
// save glyph names
Vector<PermString> glyph_names;
@@ -1769,6 +1800,7 @@ main(int argc, char *argv[])
const char *input_file = 0;
Vector<String> glyphlist_files;
bool literal_encoding = false;
+ bool have_encoding_file = false;
Vector<String> ligkern;
Vector<String> pos;
Vector<String> unicoding;
@@ -1853,12 +1885,14 @@ main(int argc, char *argv[])
if (encoding_file)
usage_error(errh, "encoding specified twice");
encoding_file = clp->vstr;
+ have_encoding_file = true;
break;
case LITERAL_ENCODING_OPT:
if (encoding_file)
usage_error(errh, "encoding specified twice");
encoding_file = clp->vstr;
+ have_encoding_file = true;
literal_encoding = true;
break;
@@ -2118,9 +2152,26 @@ main(int argc, char *argv[])
#endif
break;
+ case X_HEIGHT_OPT: {
+ char* ends;
+ if (strcmp(clp->vstr, "auto") == 0)
+ override_x_height = FontInfo::x_height_auto;
+ else if (strcmp(clp->vstr, "x") == 0)
+ override_x_height = FontInfo::x_height_x;
+ else if (strcmp(clp->vstr, "font") == 0
+ || strcmp(clp->vstr, "os/2") == 0)
+ override_x_height = FontInfo::x_height_os2;
+ else if ((x_height = strtod(clp->vstr, &ends)) >= 0
+ && *ends == 0 && *clp->vstr != 0)
+ override_x_height = FontInfo::x_height_explicit;
+ else
+ usage_error(errh, "bad --x-height option");
+ break;
+ }
+
case VERSION_OPT:
printf("otftotfm (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2002-2013 Eddie Kohler\n\
+ printf("Copyright (C) 2002-2014 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
@@ -2162,10 +2213,7 @@ particular purpose.\n");
// set up file names
if (!input_file)
usage_error(errh, "no font filename provided");
- if (!encoding_file) {
- errh->warning("no encoding provided");
- errh->message("(Use %<-e ENCODING%> to choose an encoding. %<-e texnansx%> often works,\nor say %<-e -%> to turn off this warning.)");
- } else if (encoding_file == "-")
+ if (encoding_file == "-")
encoding_file = "";
// set up feature filters
@@ -2238,8 +2286,18 @@ particular purpose.\n");
else
errh->fatal("encoding %<%s%> not found", encoding_file.c_str());
} else {
+ String cff_data(otf.table("CFF"));
+ if (!cff_data)
+ errh->error("explicit encoding required for TrueType fonts");
+ else if (!have_encoding_file)
+ errh->warning("no encoding provided");
+ if (!cff_data || !have_encoding_file)
+ errh->message("(Use %<-e ENCODING%> to choose an encoding. %<-e texnansx%> often works,\nor say %<-e -%> to turn off this warning.)");
+ if (!cff_data)
+ exit(1);
+
// use encoding from font
- Cff cff(otf.table("CFF"), &bail_errh);
+ Cff cff(cff_data, otf.units_per_em(), &bail_errh);
Cff::FontParent *font = cff.font(PermString(), &bail_errh);
assert(cff.ok() && font->ok());
if (Type1Encoding *t1e = font->type1_encoding()) {
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/otftotfm.hh
index 67c0e0b32ab..e509e1577af 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/otftotfm.hh
@@ -17,9 +17,8 @@ void output_metrics(Metrics &metrics, const String &ps_name, int boundary_char,
String (*dvips_include)(const String &ps_name, const FontInfo &, ErrorHandler *),
ErrorHandler *errh);
-int font_x_height(const FontInfo &, const Transform &);
-int font_cap_height(const FontInfo &, const Transform &);
-int font_ascender(const FontInfo &, const Transform &);
+double font_cap_height(const FontInfo &, const Transform &);
+double font_ascender(const FontInfo &, const Transform &);
double font_slant(const FontInfo &);
#endif
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/secondary.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/secondary.cc
index a951bc7d304..7726e2e77fd 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/secondary.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/secondary.cc
@@ -1,6 +1,6 @@
/* secondary.{cc,hh} -- code for generating fake glyphs
*
- * Copyright (c) 2003-2012 Eddie Kohler
+ * Copyright (c) 2003-2014 Eddie Kohler
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -89,13 +89,13 @@ enum {
FontInfo::FontInfo(const Efont::OpenType::Font *otf_, ErrorHandler *errh)
: otf(otf_), cmap(0), cff_file(0), cff(0), post(0), name(0), _nglyphs(-1),
_got_glyph_names(false), _ttb_program(0), _override_is_fixed_pitch(false),
- _override_italic_angle(false)
+ _override_italic_angle(false), _override_x_height(x_height_auto)
{
cmap = new Efont::OpenType::Cmap(otf->table("cmap"), errh);
assert(cmap->ok());
if (String cff_string = otf->table("CFF")) {
- cff_file = new Efont::Cff(cff_string, errh);
+ cff_file = new Efont::Cff(cff_string, otf->units_per_em(), errh);
if (!cff_file->ok())
return;
Efont::Cff::FontParent *fp = cff_file->font(PermString(), errh);
@@ -219,6 +219,34 @@ FontInfo::italic_angle() const
return post->italic_angle();
}
+double FontInfo::x_height(const Transform& font_xform) const {
+ if (_override_x_height == x_height_explicit)
+ return _x_height;
+ double x1 = -1, x2 = -1;
+ if (_override_x_height != x_height_os2)
+ // XXX what if 'x', 'm', 'z' were subject to substitution?
+ x1 = char_one_bound(*this, font_xform, 3, false, units_per_em(),
+ (int) 'x', (int) 'm', (int) 'z', 0);
+ if (_override_x_height != x_height_x)
+ try {
+ Efont::OpenType::Os2 os2(otf->table("OS/2"));
+ x2 = (Point(0, os2.x_height()) * font_xform).y;
+ } catch (Efont::OpenType::Bounds) {
+ }
+ static bool warned = false;
+ if (_override_x_height == x_height_auto && x1 >= 0 && x2 >= 0
+ && fabs(x1 - x2) > units_per_em() / 100.) {
+ if (!warned) {
+ ErrorHandler* errh = ErrorHandler::default_handler();
+ errh->warning("font x-height and height of %<x%> differ by %d%%", (int) (fabs(x1 - x2) * 100 / units_per_em()));
+ errh->message("(The height of %<x%> is usually more reliable than the x-height, so I%,m\nusing that. Or try --use-x-height or --no-use-x-height.)\n");
+ warned = true;
+ }
+ return x1;
+ } else
+ return x2 >= 0 ? x2 : x1;
+}
+
/* */
@@ -271,12 +299,12 @@ T1Secondary::T1Secondary(const FontInfo &finfo, const String &font_name,
const String &otf_file_name)
: _finfo(finfo), _font_name(font_name), _otf_file_name(otf_file_name),
_units_per_em(finfo.units_per_em()),
- _xheight(font_x_height(finfo, Transform())),
+ _xheight((int) ceil(finfo.x_height(Transform()))),
_spacewidth(_units_per_em)
{
- int bounds[4], width;
+ double bounds[4], width;
if (char_bounds(bounds, width, finfo, Transform(), ' '))
- _spacewidth = width;
+ _spacewidth = (int) ceil(width);
}
int
@@ -452,13 +480,16 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
v.push_back(Setting(Setting::RULE, 0, font_ascender(_finfo, xform)));
return 1;
- case U_VISIBLESPACE:
- v.push_back(Setting(Setting::MOVE, 50, -150));
- v.push_back(Setting(Setting::RULE, 40, 150));
- v.push_back(Setting(Setting::RULE, _spacewidth, 40));
- v.push_back(Setting(Setting::RULE, 40, 150));
- v.push_back(Setting(Setting::MOVE, 50, 150));
+ case U_VISIBLESPACE: {
+ int sb = (int) (0.050 * _units_per_em), h = (int) (0.150 * _units_per_em),
+ lw = (int) (0.040 * _units_per_em);
+ v.push_back(Setting(Setting::MOVE, sb, -h));
+ v.push_back(Setting(Setting::RULE, lw, h));
+ v.push_back(Setting(Setting::RULE, _spacewidth, lw));
+ v.push_back(Setting(Setting::RULE, lw, h));
+ v.push_back(Setting(Setting::MOVE, sb, h));
return 2;
+ }
case U_SS:
if (char_setting(v, metrics, 'S', 'S', 0))
@@ -565,12 +596,12 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
break;
case U_ASTERISKMATH: {
- int bounds[5];
+ double bounds[5];
double dropdown = 0;
if (char_bounds(bounds, bounds[4], _finfo, xform, '*'))
- dropdown += std::max(bounds[3], 0) + std::min(bounds[1], 0);
+ dropdown += std::max(bounds[3], 0.) + std::min(bounds[1], 0.);
if (char_bounds(bounds, bounds[4], _finfo, xform, '('))
- dropdown -= std::max(bounds[3], 0) + std::min(bounds[1], 0);
+ dropdown -= std::max(bounds[3], 0.) + std::min(bounds[1], 0.);
v.push_back(Setting(Setting::MOVE, 0, (int) (-dropdown / 2)));
if (char_setting(v, metrics, '*', 0)) {
v.push_back(Setting(Setting::MOVE, 0, -(int) (-dropdown / 2)));
@@ -583,7 +614,7 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_setting(v, metrics, U_ENDASH, 0)) {
if (!_finfo.is_fixed_pitch()) {
double d = char_one_bound(_finfo, xform, 4, true, 0, U_ENDASH, 0);
- v.push_back(Setting(Setting::MOVE, (int) (667 - 2 * d - letterspace), 0));
+ v.push_back(Setting(Setting::MOVE, (int) (_units_per_em * 0.667 - 2 * d - letterspace), 0));
}
char_setting(v, metrics, U_ENDASH, 0);
return 1;
@@ -594,7 +625,7 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
if (char_setting(v, metrics, U_ENDASH, 0)) {
if (!_finfo.is_fixed_pitch()) {
double d = char_one_bound(_finfo, xform, 4, true, 0, U_ENDASH, 0);
- v.push_back(Setting(Setting::MOVE, (int) (750 - 2 * d - letterspace), 0));
+ v.push_back(Setting(Setting::MOVE, (int) (_units_per_em * 0.750 - 2 * d - letterspace), 0));
}
char_setting(v, metrics, U_ENDASH, 0);
return 1;
@@ -610,7 +641,8 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
case U_INTERROBANG: {
double exclam_offset =
(char_one_bound(_finfo, xform, 4, true, 0, '?', 0)
- - char_one_bound(_finfo, xform, 4, true, 0, '!', 0)) * 0.5 + 50;
+ - char_one_bound(_finfo, xform, 4, true, 0, '!', 0)) * 0.5
+ + 0.050 * _units_per_em;
v.push_back(Setting(Setting::PUSH));
v.push_back(Setting(Setting::MOVE, (int) exclam_offset, 0));
if (char_setting(v, metrics, '!', 0)) {
@@ -624,7 +656,8 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
case U_INTERROBANGDOWN: {
double exclam_offset =
(char_one_bound(_finfo, xform, 4, true, 0, U_QUESTIONDOWN, 0)
- - char_one_bound(_finfo, xform, 4, true, 0, U_EXCLAMDOWN, 0)) * 0.5 + 50;
+ - char_one_bound(_finfo, xform, 4, true, 0, U_EXCLAMDOWN, 0)) * 0.5
+ + 0.050 * _units_per_em;
v.push_back(Setting(Setting::PUSH));
v.push_back(Setting(Setting::MOVE, (int) exclam_offset, 0));
if (char_setting(v, metrics, U_EXCLAMDOWN, 0)) {
@@ -675,7 +708,7 @@ T1Secondary::setting(uint32_t uni, Vector<Setting> &v, Metrics &metrics, ErrorHa
bool
-char_bounds(int bounds[4], int &width, const FontInfo &finfo,
+char_bounds(double bounds[4], double& width, const FontInfo &finfo,
const Transform &transform, uint32_t uni)
{
if (Efont::OpenType::Glyph g = finfo.cmap->map_uni(uni))
@@ -684,37 +717,24 @@ char_bounds(int bounds[4], int &width, const FontInfo &finfo,
return false;
}
-int
+double
char_one_bound(const FontInfo &finfo, const Transform &transform,
- int dimen, bool max, int best, uint32_t uni, ...)
+ int dimen, bool max, double best, int uni, ...)
{
- int bounds[5];
+ double bounds[5];
va_list val;
va_start(val, uni);
while (uni != 0) {
if (char_bounds(bounds, bounds[4], finfo, transform, uni))
if (max ? bounds[dimen] > best : bounds[dimen] < best)
best = bounds[dimen];
- uni = va_arg(val, uint32_t);
+ uni = va_arg(val, int);
}
va_end(val);
return best;
}
-int
-font_x_height(const FontInfo &finfo, const Transform &font_xform)
-{
- try {
- Efont::OpenType::Os2 os2(finfo.otf->table("OS/2"));
- return os2.x_height();
- } catch (Efont::OpenType::Bounds) {
- // XXX what if 'x', 'm', 'z' were subject to substitution?
- return char_one_bound(finfo, font_xform, 3, false, finfo.units_per_em(),
- 'x', 'm', 'z', 0);
- }
-}
-
-int
+double
font_cap_height(const FontInfo &finfo, const Transform &font_xform)
{
try {
@@ -723,11 +743,11 @@ font_cap_height(const FontInfo &finfo, const Transform &font_xform)
} catch (Efont::OpenType::Bounds) {
// XXX what if 'H', 'O', 'B' were subject to substitution?
return char_one_bound(finfo, font_xform, 3, false, finfo.units_per_em(),
- 'H', 'O', 'B', 0);
+ (int) 'H', (int) 'O', (int) 'B', 0);
}
}
-int
+double
font_ascender(const FontInfo &finfo, const Transform &font_xform)
{
try {
@@ -736,7 +756,7 @@ font_ascender(const FontInfo &finfo, const Transform &font_xform)
} catch (Efont::OpenType::Bounds) {
// XXX what if 'd', 'l' were subject to substitution?
return char_one_bound(finfo, font_xform, 3, true,
- font_x_height(finfo, font_xform),
- 'd', 'l', 0);
+ finfo.x_height(font_xform),
+ (int) 'd', (int) 'l', 0);
}
}
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/secondary.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/secondary.hh
index c349a48dcf6..81857fd4e9d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/secondary.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/secondary.hh
@@ -33,6 +33,7 @@ struct FontInfo {
bool is_fixed_pitch() const;
double italic_angle() const;
+ double x_height(const Transform& font_xform) const;
void set_is_fixed_pitch(bool is_fixed_pitch) {
_override_is_fixed_pitch = true;
@@ -42,6 +43,12 @@ struct FontInfo {
_override_italic_angle = true;
_italic_angle = italic_angle;
}
+ enum { x_height_auto = 0, x_height_explicit,
+ x_height_os2, x_height_x };
+ void set_x_height(int source, double x_height) {
+ _override_x_height = source;
+ _x_height = x_height;
+ }
String family_name() const;
String postscript_name() const;
@@ -56,7 +63,9 @@ struct FontInfo {
bool _override_is_fixed_pitch;
bool _override_italic_angle;
bool _is_fixed_pitch;
+ uint8_t _override_x_height;
double _italic_angle;
+ double _x_height;
};
@@ -88,10 +97,10 @@ class T1Secondary : public Secondary { public:
int dotlessj_font(Metrics &, ErrorHandler *, Glyph &dj_glyph);
};
-bool char_bounds(int bounds[4], int &width, const FontInfo &,
+bool char_bounds(double bounds[4], double& width, const FontInfo &,
const Transform &, uint32_t uni);
-int char_one_bound(const FontInfo &, const Transform &,
- int dimen, bool max, int best, uint32_t uni, ...);
+double char_one_bound(const FontInfo &, const Transform &,
+ int dimen, bool max, double best, int uni, ...);
#endif
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/uniprop.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/uniprop.cc
index 228661394a9..228661394a9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/uniprop.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/uniprop.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/uniprop.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/uniprop.hh
index 4dd6b135eb7..4dd6b135eb7 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/uniprop.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/uniprop.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/util.cc
index b50ff9566d3..b50ff9566d3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/util.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/util.hh
index a3e42b63d9f..a3e42b63d9f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/otftotfm/util.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/Makefile.am
index 41360807e13..41360807e13 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/Makefile.in
index 887c4b6b3a6..d23a17e86a2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1dotlessj$(EXEEXT)
-subdir = lcdf-typetools-2.100/t1dotlessj
+subdir = lcdf-typetools-2.101/t1dotlessj
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -353,9 +353,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.100/t1dotlessj/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/t1dotlessj/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/t1dotlessj/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/t1dotlessj.1
index 93b7c75a5bb..93b7c75a5bb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/t1dotlessj.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/t1dotlessj.1
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/t1dotlessj.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/t1dotlessj.cc
index fb66c8f5a67..03f56452728 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1dotlessj/t1dotlessj.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1dotlessj/t1dotlessj.cc
@@ -124,6 +124,8 @@ class Sectioner : public Type1CharstringGenInterp { public:
Vector<String> _sections;
Vector<int> _bounds;
+ void append_bounds();
+
};
Sectioner::Sectioner(int precision)
@@ -153,6 +155,15 @@ Sectioner::act_flex(int cmd, const Point &p0, const Point &p1, const Point &p2,
_boundser.act_flex(cmd, p0, p1, p2, p3_4, p5, p6, p7, flex_depth);
}
+void Sectioner::append_bounds() {
+ double bb[5];
+ _boundser.output(bb, bb[4]);
+ _bounds.push_back((int) floor(bb[0]));
+ _bounds.push_back((int) floor(bb[1]));
+ _bounds.push_back((int) ceil(bb[2]));
+ _bounds.push_back((int) ceil(bb[3]));
+}
+
void
Sectioner::act_closepath(int cmd)
{
@@ -160,9 +171,7 @@ Sectioner::act_closepath(int cmd)
Type1Charstring result;
Type1CharstringGenInterp::intermediate_output(result);
_sections.push_back(result.data_string());
- _bounds.resize(_bounds.size() + 4);
- int width_crap;
- _boundser.output(_bounds.end() - 4, width_crap);
+ append_bounds();
_boundser.clear();
}
@@ -173,9 +182,7 @@ Sectioner::run(const CharstringContext &g)
Type1Charstring last_section;
Type1CharstringGenInterp::run(g, last_section);
_sections.push_back(last_section.data_string());
- _bounds.resize(_bounds.size() + 4);
- int width_crap;
- _boundser.output(_bounds.end() - 4, width_crap);
+ append_bounds();
}
void
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/Makefile.am
index c76b5671fe5..c76b5671fe5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/Makefile.in
index 49f75b40ff3..3c498595427 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1lint$(EXEEXT)
-subdir = lcdf-typetools-2.100/t1lint
+subdir = lcdf-typetools-2.101/t1lint
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -373,9 +373,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.100/t1lint/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/t1lint/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/t1lint/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/t1lint/cscheck.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/cscheck.cc
index f39a040a014..f39a040a014 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/cscheck.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/cscheck.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/cscheck.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/cscheck.hh
index 9ba167b1588..9ba167b1588 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/cscheck.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/cscheck.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/t1lint.1
index a0173e65911..a0173e65911 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/t1lint.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/t1lint.1
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/t1lint.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/t1lint.cc
index b05d7842c0f..b05d7842c0f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1lint/t1lint.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1lint/t1lint.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/Makefile.am
index 035c5cb1c9d..035c5cb1c9d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/Makefile.in
index 6b278660078..1ba8b9e5b38 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1rawafm$(EXEEXT)
-subdir = lcdf-typetools-2.100/t1rawafm
+subdir = lcdf-typetools-2.101/t1rawafm
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -353,9 +353,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.100/t1rawafm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/t1rawafm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/t1rawafm/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/t1rawafm/t1rawafm.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/t1rawafm.1
index 66d258ca545..66d258ca545 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/t1rawafm.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/t1rawafm.1
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/t1rawafm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/t1rawafm.cc
index 682aad6c575..84a851227ee 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1rawafm/t1rawafm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1rawafm/t1rawafm.cc
@@ -179,10 +179,12 @@ strip_newlines(const String &str)
static void
write_char(FILE *outf, int c, PermString n, Type1Charstring *g, const Transform &font_transform, Type1Font *font)
{
- int bb[4], wx;
+ double bb[4], wx;
CharstringBounds::bounds(font_transform, CharstringContext(font, g), bb, wx);
fprintf(outf, "C %d ; WX %d ; N %s ; B %d %d %d %d ;\n",
- c, wx, n.c_str(), bb[0], bb[1], bb[2], bb[3]);
+ c, (int) ceil(wx), n.c_str(),
+ (int) floor(bb[0]), (int) floor(bb[1]),
+ (int) ceil(bb[2]), (int) ceil(bb[3]));
}
static void
@@ -211,26 +213,26 @@ Comment Generated by t1rawafm\n");
font_transform.scale(1000);
}
- int bb[4], wx;
+ double bb[4], wx;
if (Type1Charstring *t1cs = font->glyph("H")) {
CharstringBounds::bounds(font_transform, CharstringContext(font, t1cs), bb, wx);
if (bb[3])
- fprintf(outf, "Ascender %d\n", bb[3]);
+ fprintf(outf, "CapHeight %d\n", (int) ceil(bb[3]));
}
if (Type1Charstring *t1cs = font->glyph("x")) {
CharstringBounds::bounds(font_transform, CharstringContext(font, t1cs), bb, wx);
if (bb[3])
- fprintf(outf, "XHeight %d\n", bb[3]);
+ fprintf(outf, "XHeight %d\n", (int) ceil(bb[3]));
}
if (Type1Charstring *t1cs = font->glyph("d")) {
CharstringBounds::bounds(font_transform, CharstringContext(font, t1cs), bb, wx);
if (bb[3])
- fprintf(outf, "Ascender %d\n", bb[3]);
+ fprintf(outf, "Ascender %d\n", (int) ceil(bb[3]));
}
if (Type1Charstring *t1cs = font->glyph("p")) {
CharstringBounds::bounds(font_transform, CharstringContext(font, t1cs), bb, wx);
- if (bb[3])
- fprintf(outf, "Descender %d\n", bb[1]);
+ if (bb[1])
+ fprintf(outf, "Descender %d\n", (int) floor(bb[1]));
}
Vector<double> vd;
@@ -241,7 +243,7 @@ Comment Generated by t1rawafm\n");
if (t1d->value_numvec(vd) && vd.size() > 0)
fprintf(outf, "StdVW %d\n", (int) ceil(vd[0]));
- int fontbb[4] = { 1000000, 1000000, -1000000, -1000000 };
+ double fontbb[4] = { 1000000, 1000000, -1000000, -1000000 };
for (int i = 0; i < font->nglyphs(); ++i) {
CharstringBounds::bounds(font_transform, CharstringContext(font, font->glyph(i)), bb, wx);
fontbb[0] = std::min(fontbb[0], bb[0]);
@@ -249,7 +251,9 @@ Comment Generated by t1rawafm\n");
fontbb[2] = std::max(fontbb[2], bb[2]);
fontbb[3] = std::max(fontbb[3], bb[3]);
}
- fprintf(outf, "FontBBox %d %d %d %d\n", fontbb[0], fontbb[1], fontbb[2], fontbb[3]);
+ fprintf(outf, "FontBBox %d %d %d %d\n",
+ (int) floor(fontbb[0]), (int) floor(fontbb[1]),
+ (int) ceil(fontbb[2]), (int) ceil(fontbb[3]));
fprintf(outf, "FontName %s\n", font->font_name().c_str());
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/Makefile.am
index b022669f5d3..b022669f5d3 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/Makefile.in
index f0b2cf40ef9..bc3bf1ae23c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1reencode$(EXEEXT)
-subdir = lcdf-typetools-2.100/t1reencode
+subdir = lcdf-typetools-2.101/t1reencode
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -373,9 +373,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.100/t1reencode/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/t1reencode/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/t1reencode/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/t1reencode.1
index fabe158a13a..fabe158a13a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/t1reencode.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/t1reencode.1
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/t1reencode.cc
index c35fbdf01d9..c35fbdf01d9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/t1reencode.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/t1reencode.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/util.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/util.cc
index 89f43391152..89f43391152 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/util.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/util.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/util.hh b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/util.hh
index 34b9c9c5a22..34b9c9c5a22 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1reencode/util.hh
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1reencode/util.hh
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/Makefile.am
index 3e530d8f469..3e530d8f469 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/Makefile.in
index baec7874f9d..88ef8507488 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = t1testpage$(EXEEXT)
-subdir = lcdf-typetools-2.100/t1testpage
+subdir = lcdf-typetools-2.101/t1testpage
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -353,9 +353,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.100/t1testpage/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/t1testpage/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/t1testpage/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/t1testpage.1
index 0870002f7bc..0870002f7bc 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/t1testpage.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/t1testpage.1
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/t1testpage.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/t1testpage.cc
index 507428b4c4f..507428b4c4f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/t1testpage/t1testpage.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/t1testpage/t1testpage.cc
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/texglyphlist-g2u.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/texglyphlist-g2u.txt
index 2340809a4de..2340809a4de 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/texglyphlist-g2u.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/texglyphlist-g2u.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/texglyphlist.txt b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/texglyphlist.txt
index b9c5fa9af0f..b9c5fa9af0f 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/texglyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/texglyphlist.txt
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/Makefile.am b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/Makefile.am
index d1c220870e9..d1c220870e9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/Makefile.am
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/Makefile.in
index d73468c6aa1..74852bee4f9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = ttftotype42$(EXEEXT)
-subdir = lcdf-typetools-2.100/ttftotype42
+subdir = lcdf-typetools-2.101/ttftotype42
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -353,9 +353,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.100/ttftotype42/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.101/ttftotype42/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lcdf-typetools-2.100/ttftotype42/Makefile
+ $(AUTOMAKE) --foreign lcdf-typetools-2.101/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.100/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/ttftotype42.1
index 3fab380e787..3fab380e787 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/ttftotype42.1
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/ttftotype42.1
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/ttftotype42.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/ttftotype42.cc
index 3d1c9c7625d..3fb1b672daa 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.100/ttftotype42/ttftotype42.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.101/ttftotype42/ttftotype42.cc
@@ -355,7 +355,7 @@ main(int argc, char *argv[])
case VERSION_OPT:
printf("ttftotype42 (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2006-2013 Eddie Kohler\n\
+ printf("Copyright (C) 2006-2014 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
diff --git a/Build/source/texk/lcdf-typetools/tests/uhv_re.afm b/Build/source/texk/lcdf-typetools/tests/uhv_re.afm
index a48418688cf..03f3ec00056 100644
--- a/Build/source/texk/lcdf-typetools/tests/uhv_re.afm
+++ b/Build/source/texk/lcdf-typetools/tests/uhv_re.afm
@@ -9,7 +9,7 @@ ItalicAngle 0.0
IsFixedPitch false
UnderlinePosition -100
UnderlineThickness 50
-Ascender 718
+CapHeight 718
XHeight 523
Ascender 718
Descender -207
diff --git a/Build/source/texk/lcdf-typetools/version.ac b/Build/source/texk/lcdf-typetools/version.ac
index 612cd5f287d..57ec625d6a0 100644
--- a/Build/source/texk/lcdf-typetools/version.ac
+++ b/Build/source/texk/lcdf-typetools/version.ac
@@ -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.100])
+m4_define([lcdf_typetools_version], [2.101])