diff options
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/libs/README | 4 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/Makefile.in | 4 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/configure | 32 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.35-PATCHES/ChangeLog | 159 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.35/README | 7 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36-PATCHES/ChangeLog | 79 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36-PATCHES/TL-Changes (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35-PATCHES/TL-Changes) | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/AUTHORS (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/AUTHORS) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/Android.mk (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/Android.mk) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/ChangeLog (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/ChangeLog) | 533 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/Makefile.am (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/Makefile.am) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/NEWS (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/NEWS) | 12 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/README | 10 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/THANKS (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/THANKS) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/TODO (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/TODO) | 0 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/autogen.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/autogen.sh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/config.h.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/config.h.in) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/configure.ac (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/configure.ac) | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/gtk-doc.make (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/gtk-doc.make) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/harfbuzz.doap (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/harfbuzz.doap) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/Makefile.am (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/Makefile.am) | 43 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-c-linkage-decls.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-c-linkage-decls.sh) | 0 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-defs.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-defs.sh) | 2 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-header-guards.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-header-guards.sh) | 0 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-includes.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-includes.sh) | 0 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-libstdc++.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-libstdc++.sh) | 14 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-static-inits.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-static-inits.sh) | 4 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-symbols.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-symbols.sh) | 10 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/gen-arabic-table.py (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/gen-arabic-table.py) | 0 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/gen-indic-table.py (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/gen-indic-table.py) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/harfbuzz-gobject.pc.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/harfbuzz-gobject.pc.in) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/harfbuzz-icu.pc.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/harfbuzz-icu.pc.in) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/harfbuzz.pc.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/harfbuzz.pc.in) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-atomic-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-atomic-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-blob.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-blob.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-blob.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-blob.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-json.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-json.hh) | 62 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-json.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-json.rl) | 4 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-text.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-text.hh) | 10 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-text.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-text.rl) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-serialize.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-serialize.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-cache-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-cache-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-common.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-common.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-common.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-common.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-coretext.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-coretext.cc) | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-coretext.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-coretext.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-deprecated.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-deprecated.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-face-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-face-private.hh) | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-face.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-face.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-face.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-face.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-fallback-shape.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-fallback-shape.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-font-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-font-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-font.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-font.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-font.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-font.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ft.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ft.cc) | 4 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ft.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ft.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-glib.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-glib.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-glib.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-glib.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-enums.cc.tmpl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-enums.cc.tmpl) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-enums.h.tmpl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-enums.h.tmpl) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-structs.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-structs.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-structs.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-structs.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-graphite2.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-graphite2.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-graphite2.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-graphite2.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-icu.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-icu.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-icu.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-icu.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-mutex-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-mutex-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-object-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-object-private.hh) | 107 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-open-file-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-open-file-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-open-type-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-open-type-private.hh) | 75 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-cmap-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-cmap-table.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-font.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-font.cc) | 205 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-font.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-font.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-head-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-head-table.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-hhea-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-hhea-table.hh) | 63 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-hmtx-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-hmtx-table.hh) | 35 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-common-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-common-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gdef-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gdef-table.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gpos-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gpos-table.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gsub-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gsub-table.hh) | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gsubgpos-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gsubgpos-private.hh) | 17 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-jstf-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-jstf-table.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-map-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-map-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-map.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-map.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-maxp-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-maxp-table.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-name-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-name-table.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic-fallback.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic-fallback.hh) | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic-table.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic-win1256.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic-win1256.hh) | 5 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-default.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-default.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-hangul.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-hangul.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-hebrew.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-hebrew.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-machine.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-machine.hh) | 60 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-machine.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-machine.rl) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-table.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-table.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-myanmar-machine.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-myanmar-machine.hh) | 12 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-myanmar-machine.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-myanmar-machine.rl) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-myanmar.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-myanmar.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-sea-machine.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-sea-machine.hh) | 12 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-sea-machine.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-sea-machine.rl) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-sea.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-sea.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-thai.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-thai.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-tibetan.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-tibetan.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-fallback-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-fallback-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-fallback.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-fallback.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-normalize-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-normalize-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-normalize.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-normalize.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-tag.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-tag.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-tag.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-tag.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-private.hh) | 59 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-set-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-set-private.hh) | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-set.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-set.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-set.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-set.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape-plan-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape-plan-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape-plan.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape-plan.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape-plan.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape-plan.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper-impl-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper-impl-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper-list.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper-list.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ucdn.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ucdn.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-unicode-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-unicode-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-unicode.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-unicode.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-unicode.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-unicode.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-uniscribe.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-uniscribe.cc) | 6 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-uniscribe.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-uniscribe.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-utf-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-utf-private.hh) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-version.h.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-version.h.in) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-warning.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-warning.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb.h) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/main.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/main.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test-buffer-serialize.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test-buffer-serialize.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test-size-params.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test-size-params.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test-would-substitute.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test-would-substitute.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test.cc) | 0 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/version.ac | 2 |
154 files changed, 1108 insertions, 562 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README index 68f61969367..be855cc2da7 100644 --- a/Build/source/libs/README +++ b/Build/source/libs/README @@ -24,7 +24,7 @@ gmp 6.0.0 - checked 25mar14 graphite2 1.2.4 - checked 2dec13 http://sourceforge.net/projects/silgraphite/files/graphite2/ -harfbuzz 0.9.35 - checked 14aug14 +harfbuzz 0.9.36 - checked 11nov14 http://www.freedesktop.org/software/harfbuzz/release/ icu 54.1 (release) - checked 2oct14 @@ -33,7 +33,7 @@ icu 54.1 (release) - checked 2oct14 libpaper 1.1.24+nmu2 - checked 24oct13 ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/ -libpng 1.6.14 - checked 23oct14 +libpng 1.6.15 - checked 11nov14 http://www.libpng.org/ - used by many http://www.libpng.org/pub/png/pngcode.html diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index 24fccb39cac..0677c48855a 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,8 @@ +2014-11-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import harfbuzz-0.9.36. + * version.ac: Adjust. + 2014-08-14 Peter Breitenlohner <peb@mppmu.mpg.de> Import harfbuzz-0.9.35. diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in index 5af5801c034..7c7b98a6d09 100644 --- a/Build/source/libs/harfbuzz/Makefile.in +++ b/Build/source/libs/harfbuzz/Makefile.in @@ -83,7 +83,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/config.h.in \ - $(top_srcdir)/harfbuzz-0.9.35/src/hb-version.h.in \ + $(top_srcdir)/harfbuzz-0.9.36/src/hb-version.h.in \ $(am__dist_check_SCRIPTS_DIST) \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/test-driver ChangeLog \ @@ -778,7 +778,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-0.9.35/src/hb-version.h.in +hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-0.9.36/src/hb-version.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ clean-noinstLIBRARIES: diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index d756fc234dc..f9296861ca8 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 0.9.35. +# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 0.9.36. # # Report bugs to <tex-k@tug.org>. # @@ -580,12 +580,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='harfbuzz (TeX Live)' PACKAGE_TARNAME='harfbuzz--tex-live-' -PACKAGE_VERSION='0.9.35' -PACKAGE_STRING='harfbuzz (TeX Live) 0.9.35' +PACKAGE_VERSION='0.9.36' +PACKAGE_STRING='harfbuzz (TeX Live) 0.9.36' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="harfbuzz-0.9.35/src/harfbuzz.pc.in" +ac_unique_file="harfbuzz-0.9.36/src/harfbuzz.pc.in" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1325,7 +1325,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 harfbuzz (TeX Live) 0.9.35 to adapt to many kinds of systems. +\`configure' configures harfbuzz (TeX Live) 0.9.36 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of harfbuzz (TeX Live) 0.9.35:";; + short | recursive ) echo "Configuration of harfbuzz (TeX Live) 0.9.36:";; esac cat <<\_ACEOF @@ -1509,7 +1509,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -harfbuzz (TeX Live) configure 0.9.35 +harfbuzz (TeX Live) configure 0.9.36 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2099,7 +2099,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 harfbuzz (TeX Live) $as_me 0.9.35, which was +It was created by harfbuzz (TeX Live) $as_me 0.9.36, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4022,7 +4022,7 @@ fi # Define the identity of the package. PACKAGE='harfbuzz--tex-live-' - VERSION='0.9.35' + VERSION='0.9.36' cat >>confdefs.h <<_ACEOF @@ -4224,8 +4224,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags HB_VERSION_MAJOR=0 HB_VERSION_MINOR=9 -HB_VERSION_MICRO=35 -HB_VERSION=0.9.35 +HB_VERSION_MICRO=36 +HB_VERSION=0.9.36 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6641,14 +6641,14 @@ $as_echo "#define HAVE_INTEL_ATOMIC_PRIMITIVES 1" >>confdefs.h fi -HARFBUZZ_TREE=harfbuzz-0.9.35 +HARFBUZZ_TREE=harfbuzz-0.9.36 if test -f $srcdir/$HARFBUZZ_TREE/src/hb-version.h; then as_fn_error $? "Sorry, you must remove the file $HARFBUZZ_TREE/src/hb-version.h" "$LINENO" 5 fi -ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-0.9.35/src/hb-version.h.in" +ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-0.9.36/src/hb-version.h.in" cat >confcache <<\_ACEOF @@ -7197,7 +7197,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 harfbuzz (TeX Live) $as_me 0.9.35, which was +This file was extended by harfbuzz (TeX Live) $as_me 0.9.36, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7263,7 +7263,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="\\ -harfbuzz (TeX Live) config.status 0.9.35 +harfbuzz (TeX Live) config.status 0.9.36 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7396,7 +7396,7 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-0.9.35/src/hb-version.h.in" ;; + "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-0.9.36/src/hb-version.h.in" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.35-PATCHES/ChangeLog deleted file mode 100644 index daa5fd88c4a..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35-PATCHES/ChangeLog +++ /dev/null @@ -1,159 +0,0 @@ -2014-08-14 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.35 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2014-08-03 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.34 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2014-07-23 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.33 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - - * patch-01-cygwin (removed): Applied upstream. - -2014-07-18 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.32 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - - * patch-01-cygwin: Adapted. - -2014-07-17 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.31 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - - * patch-01-cygwin: Adapted. - -2014-07-10 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.30 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - - * patch-01-cygwin: Adapted. - -2014-06-23 Peter Breitenlohner <peb@mppmu.mpg.de> - - * patch-01-cygwin (new): Avoid 'not supported' warnings. - -2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.29 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2014-04-29 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.28 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2014-03-19 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.27 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2014-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.26 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-12-05 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.25 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-11-14 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.24 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-10-29 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.23 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-10-04 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.22 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-09-17 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.21 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-09-10 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.20 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-07-17 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.19 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-06-02 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.18 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-03-22 Khaled Hosny <khaledhosny@eglug.org> - - Imported harfbuzz-0.9.14 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-02-27 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.13 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-01-19 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.12 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-01-11 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.11 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - * patch-01-const (removed): Applied upstream. - -2013-01-04 Peter Breitenlohner <peb@mppmu.mpg.de> - - * patch-01-const (new): Backport from upstream. - -2013-01-03 Khaled Hosny <khaledhosny@eglug.org> - - Imported harfbuzz-0.9.10 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - * patch-03-VOID (removed): Applied upstream. - * patch-04-MSV (removed): ditto. - -2012-12-06 Peter Breitenlohner <peb@mppmu.mpg.de> - - * patch-04-MSV (new): From Akira for MS Visual Studio 2005. - -2012-12-05 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.8 source tree from: - http://cgit.freedesktop.org/harfbuzz/ - * patch-01-Khaled (removed): Now distributed, with - hb_ot_layout_position_get_size() renamed into - hb_ot_layout_get_size_params(). - * patch-02-oldmsvc (removed): Not needed. - -2012-12-02 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - - * patch-02-oldmsvc (new): #error is not recognized by old msvcs. - -2012-11-30 Peter Breitenlohner <peb@mppmu.mpg.de> - - * patch-01-Khaled (new): Partial update from git, from Khaled. - -2012-11-29 Peter Breitenlohner <peb@mppmu.mpg.de> - - Imported harfbuzz-0.9.7 source tree from: - http://cgit.freedesktop.org/harfbuzz/ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/README b/Build/source/libs/harfbuzz/harfbuzz-0.9.35/README deleted file mode 100644 index 74e739da52a..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/README +++ /dev/null @@ -1,7 +0,0 @@ -This is HarfBuzz, a text shaping library. - -For bug reports, mailing list, and other information please visit: - - http://harfbuzz.org/ - -For license information, see the file COPYING. diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.36-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.36-PATCHES/ChangeLog new file mode 100644 index 00000000000..62fff4f77ce --- /dev/null +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36-PATCHES/ChangeLog @@ -0,0 +1,79 @@ +2014-07-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported harfbuzz-0.9.33 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin (removed): Applied upstream. + +2014-07-18 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported harfbuzz-0.9.32 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin: Adapted. + +2014-07-17 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported harfbuzz-0.9.31 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin: Adapted. + +2014-07-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported harfbuzz-0.9.30 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin: Adapted. + +2014-06-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-cygwin (new): Avoid 'not supported' warnings. + +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported harfbuzz-0.9.29 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2013-01-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported harfbuzz-0.9.11 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + * patch-01-const (removed): Applied upstream. + +2013-01-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-const (new): Backport from upstream. + +2013-01-03 Khaled Hosny <khaledhosny@eglug.org> + + Imported harfbuzz-0.9.10 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + * patch-03-VOID (removed): Applied upstream. + * patch-04-MSV (removed): ditto. + +2012-12-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-04-MSV (new): From Akira for MS Visual Studio 2005. + +2012-12-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported harfbuzz-0.9.8 source tree from: + http://cgit.freedesktop.org/harfbuzz/ + * patch-01-Khaled (removed): Now distributed, with + hb_ot_layout_position_get_size() renamed into + hb_ot_layout_get_size_params(). + * patch-02-oldmsvc (removed): Not needed. + +2012-12-02 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * patch-02-oldmsvc (new): #error is not recognized by old msvcs. + +2012-11-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-Khaled (new): Partial update from git, from Khaled. + +2012-11-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported harfbuzz-0.9.7 source tree from: + http://cgit.freedesktop.org/harfbuzz/ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-0.9.36-PATCHES/TL-Changes index b1f1b58e07a..18fa820bbb8 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35-PATCHES/TL-Changes +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36-PATCHES/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the harfbuzz-0.9.35/ tree as obtained from: +Changes applied to the harfbuzz-0.9.36/ tree as obtained from: http://www.freedesktop.org/software/harfbuzz/release/ Removed: diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/AUTHORS b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/AUTHORS index 81cdc4cf37f..81cdc4cf37f 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/AUTHORS +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/AUTHORS diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/Android.mk b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/Android.mk index 07dfa5b1d87..07dfa5b1d87 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/Android.mk +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/Android.mk diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/ChangeLog index 909fdf07426..ebb55d5dbc6 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/ChangeLog @@ -1,3 +1,536 @@ +commit c0e95abc5f3f14121483b71f10837828a3a1d73a +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Nov 20 14:42:24 2014 -0800 + + 0.9.36 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit fde3e4a423871463c883cb969e99c29cb6f69f6b +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 29 11:23:08 2014 -0700 + + In hb_ot_collect_glyphs(), don't recurse to a lookup more than once + + Otherwise, we might process a lookup thousands of times, with no + benefit. This pathological case was hit by Noto Nastaliq Urdu Draft + in Firefox's code to determine whether space glyph is involved in + any GSUB/GPOS rules. A test page is at http://behdad.org/urdu + + See: + https://bugzilla.mozilla.org/show_bug.cgi?id=1090869 + + src/hb-ot-layout-gsubgpos-private.hh | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit 5a5640d8506ccfc99fd119e89e829170d1fea421 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Tue Oct 14 21:26:13 2014 -0700 + + Move code around + + src/hb-open-type-private.hh | 50 + ++++++++++++++++++++++----------------------- + 1 file changed, 25 insertions(+), 25 deletions(-) + +commit 666b42f73bd1f516657b206ef738108825bf239f +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Tue Oct 14 21:24:59 2014 -0700 + + Move macros around + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=84491 + + src/hb-open-type-private.hh | 63 + ++++++++++++++++++++++++++++++++++++++------- + src/hb-private.hh | 41 ----------------------------- + src/hb-uniscribe.cc | 6 +++++ + 3 files changed, 60 insertions(+), 50 deletions(-) + +commit 5c87120b8178566ddae99d9825edc24f9b87ea3d +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Tue Oct 14 20:07:31 2014 -0700 + + Fix misc warnings + + Fixes https://github.com/behdad/harfbuzz/pull/51 + + src/hb-buffer-deserialize-json.rl | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-private.hh | 6 +++--- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit a1f27ac3c48cfe6d532dc422cf256952fea472ed +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Oct 2 16:54:33 2014 -0400 + + Update test expectation for previous commit + + test/shaping/tests/arabic-fallback-shaping.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8afaf096870d7895cf2fffb6438b02c0ad1b6c52 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Oct 2 16:40:41 2014 -0400 + + [ft] Add NO_HINTING in a couple other places + + src/hb-ft.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7228011411f0e490ad1ba9894dd0d576823903ea +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 18:58:43 2014 -0400 + + [travis] Fix clang again + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 406a020e5228d4a04da6282f5a75165bab7a483e +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 18:54:55 2014 -0400 + + [travis] Fail build if coveralls fails + + .travis.yml | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +commit a8aa20260dbd9af9cbcc7d545fa8b41b07aae276 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 18:48:40 2014 -0400 + + [travis] Only run coveralls under gcc + + .travis.yml | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 5de0407337d630117e424b7c715b7cbd432f4ef9 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 18:18:25 2014 -0400 + + Help clang with gcov + + src/check-defs.sh | 2 +- + src/check-symbols.sh | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit ef40ca8e5e830231539dc61088b58e907a840629 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 18:07:27 2014 -0400 + + [travis] Try to make coverage work with clang + + .travis.yml | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 52784da17b7278f2587168234878bb15d918c9fe +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 17:57:43 2014 -0400 + + [travis] Minor + + README | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f2c9005f5123c7f9b227fd9ac9a3438c5fe4cf47 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 17:45:17 2014 -0400 + + Add README.md symlink to make github happy + + README.md | 1 + + 1 file changed, 1 insertion(+) + +commit 40987e8aaca4155d9cff211549e8d23f24c334e5 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 17:44:30 2014 -0400 + + [travis] Re-enable clang + + .travis.yml | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit 5400ac476e5a5bcc66559fcfb05a683a6b433ea1 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 17:41:41 2014 -0400 + + Add build and coverage status links + + README | 3 +++ + 1 file changed, 3 insertions(+) + +commit 19360e0a5609c65842a989587b01a4dc7c9eae36 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 17:35:03 2014 -0400 + + [travis] Report matrix settings to help debugging + + .travis.yml | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 9b89fc52f49b80df1f27ac7de69e0152bdcc94d6 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 17:20:31 2014 -0400 + + [travis] More coveralls + + .travis.yml | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit a68f2b62c1f24009993911b1dbcb76b821e58c51 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 17:05:58 2014 -0400 + + [travis] Give coveralls a hand + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit 5194d647e13aa5ba2cfcdbdcd4a659dc5bd11418 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 17:03:26 2014 -0400 + + [travis] Disable clang for now + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 715f27f85f97fee13b119f60037db5c139489ee6 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 16:53:00 2014 -0400 + + [test] Fixup test + + test/shaping/tests/hangul-jamo.tests | 9 --------- + 1 file changed, 9 deletions(-) + +commit 2a508ddae5de3852243725ce22caa3dcffccb83e +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 16:49:22 2014 -0400 + + [travis] Another try at coveralls.io + + .travis.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit dfe8078e5be46cab5e67aed977749c1d6725e6a7 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 16:38:47 2014 -0400 + + [travis] First try to hookup coveralls.io code coverage tracking + + .travis.yml | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 1b387571e4d0eed883f1ae8ec85cf0e818b4a7f9 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 16:14:59 2014 -0400 + + [travis] Unbreak + + .travis.yml | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit e281ed360dfdf803aea87b6078983867d08e07a7 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 16:09:08 2014 -0400 + + [travis] Minor + + .travis.yml | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +commit c0b82ba32a1987902a3b9c05b46f8be6b121883a +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 14:24:07 2014 -0400 + + Create ragel-generated files in srcdir + + src/Makefile.am | 25 ++++++++++--------------- + 1 file changed, 10 insertions(+), 15 deletions(-) + +commit 79bbb10b0da49ace763a50f259c2ea687143f7ea +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 13:33:21 2014 -0400 + + Clean ragel-generated headers in maintainercleanfiles + + src/Makefile.am | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 8971cac83eb4f06847abfa3eaa15857d27141810 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 12:41:03 2014 -0400 + + Don't use tmp files in Makefile + + Useful for code-coverage generation of the ragel-generated files + as they will now contain the correct .hh filename in them. + + src/Makefile.am | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +commit 22723186652224a635f1dad5cda0f753e78c301d +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 11:56:07 2014 -0400 + + check-static-inits: Filter out zero-length sections + + When compiling with -O0, zero-sized constructors were showing up + and confusing the test. + + src/check-static-inits.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b695a3dc2300ed970a4154ad8b997407b3cb4faf +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 11:55:14 2014 -0400 + + check-static-inits: check for static finalizers + + src/check-static-inits.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 250398b1e4f102e4e44eeb9e2aebf0cd2d397344 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 11:28:01 2014 -0400 + + Hide other bubble-sort + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c1e87442621beff98791ce56cfd1ccee506c4ee6 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Oct 1 11:07:08 2014 -0400 + + Hide bubble-sort! + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 80f77282264afb1356351024b1f062b2824bba3b +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Sep 25 17:59:46 2014 +0300 + + [util] Fix ansi output when surface is empty + + util/helper-cairo-ansi.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 156852991e18e5ac256ee4d6b2916931cc274977 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Sep 25 17:45:49 2014 +0300 + + [ot-font] Add hb_ot_face_cmap_accelerator_t + + src/hb-ot-font.cc | 113 + +++++++++++++++++++++++++++++++----------------------- + 1 file changed, 66 insertions(+), 47 deletions(-) + +commit d088ccaf11d9475fe0d269ce130b1793b8a1ffbf +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Sep 25 17:26:56 2014 +0300 + + [ot-font] Minor + + src/hb-ot-font.cc | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit d7c160a1530adabbcf33725b105072293115a34c +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Sep 25 17:15:35 2014 +0300 + + [ot-font] Handle missing vertical metrics tables + + src/hb-ot-font.cc | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +commit be1cca270257bfdfee3fbe821175269713acf408 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Sep 25 16:53:24 2014 +0300 + + [ot-font] Add metrics_accel_t + + src/hb-ot-font.cc | 111 + ++++++++++++++++++++++-------------------------- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 4 +- + 3 files changed, 54 insertions(+), 63 deletions(-) + +commit d41b809e9d21e655129a97c600d28f278fd7e62c +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Sep 25 13:04:08 2014 +0300 + + [ot-font] Start adding vertical support + + src/hb-ot-font.cc | 57 ++++++++++++++++++++++++++++++++++---------- + src/hb-ot-hhea-table.hh | 63 + ++++++++++++++++++++++++++----------------------- + src/hb-ot-hmtx-table.hh | 35 +++++++++++++++++---------- + 3 files changed, 100 insertions(+), 55 deletions(-) + +commit 22f0de5025aeeef4c8b3ca876d291d4c8e558d94 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Mon Aug 25 12:54:57 2014 -0400 + + Fix build + + src/hb-ot-shape-complex-arabic-win1256.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit d457e3f0ff9b27616a34e4cc110d3edbf8796841 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Mon Aug 25 12:31:19 2014 -0400 + + [arabic] Don't #include __FILE__ + + Fine! + + https://code.google.com/p/chromium/issues/detail?id=406957 + + src/hb-ot-shape-complex-arabic-win1256.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ceb673d9c35bb28c9b2ed5359bdd8b23fda0019 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Mon Aug 25 11:48:12 2014 -0400 + + [arabic] Allow disabling win1256 fallback code + + By defining HB_NO_WIN1256. + + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8a9319502141c09695461c386e54f998250420e9 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Fri Aug 22 12:06:57 2014 -0400 + + [ot] Prefer Windows platform cmap tables / accept all Unicode + encodingIDs + + Some fonts on the Mac ship with (0,1). + + src/hb-ot-font.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 270971a0fccdf4964fd3e8ab8e5cf53037a3518d +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Fri Aug 15 14:28:04 2014 -0400 + + [win32] Avoid preprocessor warnings re macros + + src/hb-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 8c6bd34d38fb3007c3d660fce0095cc5c7e9962e +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Aug 14 13:33:37 2014 -0400 + + Fix check-symbols on OS X + + src/check-libstdc++.sh | 14 +++++++------- + src/check-symbols.sh | 8 +++++++- + 2 files changed, 14 insertions(+), 8 deletions(-) + +commit 522b1cc5261c1419166bfb90d2ff634b684be66a +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Aug 14 13:29:30 2014 -0400 + + [coretext] Hide feature_mappings + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0d2c2f238bf0a847ecd55a70cc0f081f18a053ac +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Aug 14 13:25:55 2014 -0400 + + Simplify hb-object + + src/hb-object-private.hh | 118 + +++++++++++++++-------------------------------- + 1 file changed, 36 insertions(+), 82 deletions(-) + +commit 9d861b81f349188a4507350398786a6e94038095 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Aug 14 13:15:21 2014 -0400 + + Really fix clang build this time + + src/hb-object-private.hh | 141 + +++++++++++++++++++++++------------------------ + 1 file changed, 68 insertions(+), 73 deletions(-) + +commit 272226f294382b0c6921b36e0e67fc53daa765d3 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Aug 14 13:11:33 2014 -0400 + + Revert "Fix build on clang after previous commit" + + This reverts commit 9c80cbc87f23040a334e30c750f64523d9ef10c8. + + src/hb-object-private.hh | 34 +++++++++++++--------------------- + 1 file changed, 13 insertions(+), 21 deletions(-) + +commit 9c80cbc87f23040a334e30c750f64523d9ef10c8 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Aug 14 13:09:52 2014 -0400 + + Fix build on clang after previous commit + + src/hb-object-private.hh | 34 +++++++++++++++++++++------------- + 1 file changed, 21 insertions(+), 13 deletions(-) + +commit a5a27073cfff91c4f80209ca8462543130af61dd +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Aug 14 13:05:36 2014 -0400 + + Rewrite this==NULL checks to avoid undefined behavior + + Fixes https://code.google.com/p/chromium/issues/detail?id=403594 + + src/hb-object-private.hh | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +commit cc3b2d432b02f9381cdf19e2dd5fbbdd002a750c +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Aug 14 12:59:16 2014 -0400 + + Remove this==NULL check from face->reference_table() + + Not supposed to happen, and apparently this is undefined in C++. + https://code.google.com/p/chromium/issues/detail?id=403594 + + src/hb-face-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cd7ea4f791dc41d62ad238673e2ea0107883c9e3 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Aug 14 12:57:02 2014 -0400 + + Make hb_object_t members private + + In preparation for fixing: + https://code.google.com/p/chromium/issues/detail?id=403594 + + src/hb-object-private.hh | 26 +++++++++++++++++++++----- + src/hb-set-private.hh | 2 +- + 2 files changed, 22 insertions(+), 6 deletions(-) + +commit c4308f895aef93ed884fd54e4ebc65b6d2cfc94a +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Aug 13 19:42:01 2014 -0400 + + Minor + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit cd5a1149d980dc3c17b6bb9d961c761b2671ba1b Author: Behdad Esfahbod <behdad@behdad.org> Date: Wed Aug 13 12:39:34 2014 -0400 diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/Makefile.am index fa8711403d5..fa8711403d5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/Makefile.am +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/Makefile.am diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/NEWS b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/NEWS index adc8f694ed4..21390c6188a 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/NEWS +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/NEWS @@ -1,3 +1,15 @@ +Overview of changes leading to 0.9.36 +Thursday, November 20, 2014 +===================================== + +- First time that three months went by without a release since + 0.9.2 was released on August 10, 2012! +- Fix performance bug in hb_ot_collect_glyphs(): + https://bugzilla.mozilla.org/show_bug.cgi?id=1090869 +- Add basic vertical-text support to hb-ot-font. +- Misc build fixes. + + Overview of changes leading to 0.9.35 Saturday, August 13, 2014 ===================================== diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.36/README b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/README new file mode 100644 index 00000000000..d34bc74f997 --- /dev/null +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/README @@ -0,0 +1,10 @@ +[](https://travis-ci.org/behdad/harfbuzz) +[](https://coveralls.io/r/behdad/harfbuzz) + +This is HarfBuzz, a text shaping library. + +For bug reports, mailing list, and other information please visit: + + http://harfbuzz.org/ + +For license information, see the file COPYING. diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/THANKS b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/THANKS index 940cfde5c39..940cfde5c39 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/THANKS +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/THANKS diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/TODO b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/TODO index e1aa39c4c01..e1aa39c4c01 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/TODO +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/TODO diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/autogen.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/autogen.sh index a267f297b06..a267f297b06 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/autogen.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/autogen.sh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/config.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/config.h.in index 491e7f428ef..491e7f428ef 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/config.h.in +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/config.h.in diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/configure.ac index b9e82d9f8f8..d8b7a03c751 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/configure.ac +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([HarfBuzz], - [0.9.35], + [0.9.36], [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz], [harfbuzz], [http://harfbuzz.org/]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/gtk-doc.make b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/gtk-doc.make index e7916563d75..e7916563d75 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/gtk-doc.make +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/gtk-doc.make diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/harfbuzz.doap b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/harfbuzz.doap index d2896ebefa8..d2896ebefa8 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/harfbuzz.doap +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/harfbuzz.doap diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/Makefile.am index ba07ac5d680..71614a4fac9 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/Makefile.am +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/Makefile.am @@ -234,8 +234,8 @@ hb-gobject-enums.%: hb-gobject-enums.%.tmpl $(HBHEADERS) $(AM_V_GEN) $(GLIB_MKENUMS) \ --identifier-prefix hb_ --symbol-prefix hb_gobject \ --template $^ | \ - sed 's/_t_get_type/_get_type/g; s/_T (/ (/g' > "$@.tmp" && \ - mv "$@.tmp" "$@" || ( $(RM) "@.tmp" && false ) + sed 's/_t_get_type/_get_type/g; s/_T (/ (/g' > "$@" \ + || ($(RM) "$@"; false) endif EXTRA_DIST += \ harfbuzz-gobject.pc.in \ @@ -251,8 +251,8 @@ EXTRA_DIST += \ -e 's@%libdir%@$(libdir)@g' \ -e 's@%includedir%@$(includedir)@g' \ -e 's@%VERSION%@$(VERSION)@g' \ - "$<" \ - > "$@.tmp" && mv "$@.tmp" "$@" || ( $(RM) "$@.tmp"; false ) + "$<" > "$@" \ + || ($(RM) "$@"; false) CLEANFILES += $(pkgconfig_DATA) @@ -265,8 +265,9 @@ harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS) sed -e 's/ (.*//' | \ LANG=C sort; \ echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \ - ) >"$@.tmp" - @ ! grep -q hb_ERROR "$@.tmp" && mv "$@.tmp" "$@" || ($(RM) "$@"; false) + ) >"$@" + @ ! grep -q hb_ERROR "$@" \ + || ($(RM) "$@"; false) GENERATORS = \ @@ -278,26 +279,25 @@ EXTRA_DIST += $(GENERATORS) unicode-tables: arabic-table indic-table indic-table: gen-indic-table.py IndicSyllabicCategory.txt IndicMatraCategory.txt Blocks.txt - $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-indic-table.cc.tmp && \ - mv hb-ot-shape-complex-indic-table.cc.tmp $(srcdir)/hb-ot-shape-complex-indic-table.cc || \ - ($(RM) hb-ot-shape-complex-indic-table.cc.tmp; false) + $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-indic-table.cc \ + || ($(RM) hb-ot-shape-complex-indic-table.cc; false) arabic-table: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt - $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-arabic-table.hh.tmp && \ - mv hb-ot-shape-complex-arabic-table.hh.tmp $(srcdir)/hb-ot-shape-complex-arabic-table.hh || \ - ($(RM) hb-ot-shape-complex-arabic-table.hh.tmp; false) + $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-arabic-table.hh \ + || ($(RM) hb-ot-shape-complex-arabic-table.hh; false) built-sources: $(BUILT_SOURCES) .PHONY: unicode-tables arabic-table indic-table built-sources -BUILT_SOURCES += \ - hb-buffer-deserialize-json.hh \ - hb-buffer-deserialize-text.hh \ - hb-ot-shape-complex-indic-machine.hh \ - hb-ot-shape-complex-myanmar-machine.hh \ - hb-ot-shape-complex-sea-machine.hh \ +RAGEL_GENERATED = \ + $(srcdir)/hb-buffer-deserialize-json.hh \ + $(srcdir)/hb-buffer-deserialize-text.hh \ + $(srcdir)/hb-ot-shape-complex-indic-machine.hh \ + $(srcdir)/hb-ot-shape-complex-myanmar-machine.hh \ + $(srcdir)/hb-ot-shape-complex-sea-machine.hh \ $(NULL) +BUILT_SOURCES += $(RAGEL_GENERATED) EXTRA_DIST += \ hb-buffer-deserialize-json.rl \ hb-buffer-deserialize-text.rl \ @@ -305,9 +305,10 @@ EXTRA_DIST += \ hb-ot-shape-complex-myanmar-machine.rl \ hb-ot-shape-complex-sea-machine.rl \ $(NULL) -.rl.hh: - $(AM_V_GEN)$(RAGEL) -e -F1 -o "$@.tmp" "$<" && \ - mv "$@.tmp" "$@" || ( $(RM) "$@.tmp" && false ) +MAINTAINERCLEANFILES += $(RAGEL_GENERATED) +$(srcdir)/%.hh: $(srcdir)/%.rl + $(AM_V_GEN)(cd $(srcdir) && $(RAGEL) -e -F1 -o "$*.hh" "$*.rl") \ + || ($(RM) "$@"; false) noinst_PROGRAMS = \ main \ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-c-linkage-decls.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-c-linkage-decls.sh index b10310f5384..b10310f5384 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-c-linkage-decls.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-c-linkage-decls.sh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-defs.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-defs.sh index 357347f543a..65a24670e48 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-defs.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-defs.sh @@ -21,7 +21,7 @@ for def in $defs; do lib=`echo "$def" | sed 's/[.]def$//;s@.*/@@'` so=.libs/lib${lib}.so - EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`" + EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`" if test -f "$so"; then diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-header-guards.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-header-guards.sh index 9a3302c7f87..9a3302c7f87 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-header-guards.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-header-guards.sh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-includes.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-includes.sh index 902f2357e2a..902f2357e2a 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-includes.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-includes.sh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-libstdc++.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-libstdc++.sh index e7e0e295e1a..27deb42dc97 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-libstdc++.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-libstdc++.sh @@ -17,14 +17,14 @@ fi tested=false for suffix in so dylib; do so=.libs/libharfbuzz.$suffix - if test -f "$so"; then - echo "Checking that we are not linking to libstdc++" - if ldd $so | grep 'libstdc[+][+]'; then - echo "Ouch, linked to libstdc++" - stat=1 - fi - tested=true + if ! test -f "$so"; then continue; fi + + echo "Checking that we are not linking to libstdc++" + if ldd $so | grep 'libstdc[+][+]'; then + echo "Ouch, linked to libstdc++" + stat=1 fi + tested=true done if ! $tested; then echo "check-libstdc++.sh: libharfbuzz shared library not found; skipping test" diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-static-inits.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-static-inits.sh index 83d02c8a9bf..1446fa73405 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-static-inits.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-static-inits.sh @@ -22,8 +22,8 @@ fi echo "Checking that no object file has static initializers" for obj in $OBJS; do - if objdump -t "$obj" | grep '[.]ctors'; then - echo "Ouch, $obj has static initializers" + if objdump -t "$obj" | grep '[.][cd]tors' | grep -v '\<00*\>'; then + echo "Ouch, $obj has static initializers/finalizers" stat=1 fi done diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-symbols.sh index e000b01b863..b2bf43fcea5 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/check-symbols.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/check-symbols.sh @@ -16,11 +16,17 @@ fi echo "Checking that we are not exposing internal symbols" tested=false -for so in `ls .libs/lib*.so .libs/lib*.dylib 2>/dev/null` ; do +for suffix in so dylib; do + so=.libs/libharfbuzz.$suffix + if ! test -f "$so"; then continue; fi - EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`" + EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`" + prefix=`basename "$so" | sed 's/libharfbuzz/hb/; s/-/_/g; s/[.].*//'` + # On mac, C symbols are prefixed with _ + if test $suffix = dylib; then prefix="_$prefix"; fi + echo "Processing $so" if echo "$EXPORTED_SYMBOLS" | grep -v "^${prefix}_"; then echo "Ouch, internal symbols exposed" diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/gen-arabic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/gen-arabic-table.py index 308435f991e..308435f991e 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/gen-arabic-table.py +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/gen-arabic-table.py diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/gen-indic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/gen-indic-table.py index 4fb76f445c6..4fb76f445c6 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/gen-indic-table.py +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/gen-indic-table.py diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/harfbuzz-gobject.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/harfbuzz-gobject.pc.in index 70083601901..70083601901 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/harfbuzz-gobject.pc.in +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/harfbuzz-gobject.pc.in diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/harfbuzz-icu.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/harfbuzz-icu.pc.in index 949869a3563..949869a3563 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/harfbuzz-icu.pc.in +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/harfbuzz-icu.pc.in diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/harfbuzz.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/harfbuzz.pc.in index 7f27bbbdef0..7f27bbbdef0 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/harfbuzz.pc.in +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/harfbuzz.pc.in diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-atomic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-atomic-private.hh index e6738b7d9f6..e6738b7d9f6 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-atomic-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-atomic-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-blob.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-blob.cc index b82b4b2a3a3..b82b4b2a3a3 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-blob.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-blob.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-blob.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-blob.h index b2419abfd2a..b2419abfd2a 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-blob.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-blob.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-json.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-json.hh index dead700db82..3f626bda40d 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-json.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-json.hh @@ -1,5 +1,5 @@ -#line 1 "../../src/hb-buffer-deserialize-json.rl" +#line 1 "hb-buffer-deserialize-json.rl" /* * Copyright © 2013 Google, Inc. * @@ -32,7 +32,7 @@ #include "hb-private.hh" -#line 36 "hb-buffer-deserialize-json.hh.tmp" +#line 36 "hb-buffer-deserialize-json.hh" static const unsigned char _deserialize_json_trans_keys[] = { 0u, 0u, 9u, 123u, 9u, 34u, 97u, 103u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, @@ -435,7 +435,7 @@ static const int deserialize_json_error = 0; static const int deserialize_json_en_main = 1; -#line 97 "../../src/hb-buffer-deserialize-json.rl" +#line 97 "hb-buffer-deserialize-json.rl" static hb_bool_t @@ -459,15 +459,15 @@ _hb_buffer_deserialize_glyphs_json (hb_buffer_t *buffer, const char *tok = NULL; int cs; - hb_glyph_info_t info; - hb_glyph_position_t pos; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; -#line 466 "hb-buffer-deserialize-json.hh.tmp" +#line 466 "hb-buffer-deserialize-json.hh" { cs = deserialize_json_start; } -#line 471 "hb-buffer-deserialize-json.hh.tmp" +#line 471 "hb-buffer-deserialize-json.hh" { int _slen; int _trans; @@ -493,14 +493,14 @@ _resume: switch ( _deserialize_json_trans_actions[_trans] ) { case 1: -#line 38 "../../src/hb-buffer-deserialize-json.rl" +#line 38 "hb-buffer-deserialize-json.rl" { memset (&info, 0, sizeof (info)); memset (&pos , 0, sizeof (pos )); } break; case 5: -#line 43 "../../src/hb-buffer-deserialize-json.rl" +#line 43 "hb-buffer-deserialize-json.rl" { buffer->add_info (info); if (buffer->in_error) @@ -510,13 +510,13 @@ _resume: } break; case 2: -#line 51 "../../src/hb-buffer-deserialize-json.rl" +#line 51 "hb-buffer-deserialize-json.rl" { tok = p; } break; case 14: -#line 55 "../../src/hb-buffer-deserialize-json.rl" +#line 55 "hb-buffer-deserialize-json.rl" { if (!hb_font_glyph_from_string (font, tok, p - tok, @@ -525,33 +525,33 @@ _resume: } break; case 15: -#line 62 "../../src/hb-buffer-deserialize-json.rl" +#line 62 "hb-buffer-deserialize-json.rl" { if (!parse_uint (tok, p, &info.codepoint)) return false; } break; case 8: -#line 63 "../../src/hb-buffer-deserialize-json.rl" +#line 63 "hb-buffer-deserialize-json.rl" { if (!parse_uint (tok, p, &info.cluster )) return false; } break; case 10: -#line 64 "../../src/hb-buffer-deserialize-json.rl" +#line 64 "hb-buffer-deserialize-json.rl" { if (!parse_int (tok, p, &pos.x_offset )) return false; } break; case 12: -#line 65 "../../src/hb-buffer-deserialize-json.rl" +#line 65 "hb-buffer-deserialize-json.rl" { if (!parse_int (tok, p, &pos.y_offset )) return false; } break; case 3: -#line 66 "../../src/hb-buffer-deserialize-json.rl" +#line 66 "hb-buffer-deserialize-json.rl" { if (!parse_int (tok, p, &pos.x_advance)) return false; } break; case 6: -#line 67 "../../src/hb-buffer-deserialize-json.rl" +#line 67 "hb-buffer-deserialize-json.rl" { if (!parse_int (tok, p, &pos.y_advance)) return false; } break; case 16: -#line 62 "../../src/hb-buffer-deserialize-json.rl" +#line 62 "hb-buffer-deserialize-json.rl" { if (!parse_uint (tok, p, &info.codepoint)) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" +#line 43 "hb-buffer-deserialize-json.rl" { buffer->add_info (info); if (buffer->in_error) @@ -561,9 +561,9 @@ _resume: } break; case 9: -#line 63 "../../src/hb-buffer-deserialize-json.rl" +#line 63 "hb-buffer-deserialize-json.rl" { if (!parse_uint (tok, p, &info.cluster )) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" +#line 43 "hb-buffer-deserialize-json.rl" { buffer->add_info (info); if (buffer->in_error) @@ -573,9 +573,9 @@ _resume: } break; case 11: -#line 64 "../../src/hb-buffer-deserialize-json.rl" +#line 64 "hb-buffer-deserialize-json.rl" { if (!parse_int (tok, p, &pos.x_offset )) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" +#line 43 "hb-buffer-deserialize-json.rl" { buffer->add_info (info); if (buffer->in_error) @@ -585,9 +585,9 @@ _resume: } break; case 13: -#line 65 "../../src/hb-buffer-deserialize-json.rl" +#line 65 "hb-buffer-deserialize-json.rl" { if (!parse_int (tok, p, &pos.y_offset )) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" +#line 43 "hb-buffer-deserialize-json.rl" { buffer->add_info (info); if (buffer->in_error) @@ -597,9 +597,9 @@ _resume: } break; case 4: -#line 66 "../../src/hb-buffer-deserialize-json.rl" +#line 66 "hb-buffer-deserialize-json.rl" { if (!parse_int (tok, p, &pos.x_advance)) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" +#line 43 "hb-buffer-deserialize-json.rl" { buffer->add_info (info); if (buffer->in_error) @@ -609,9 +609,9 @@ _resume: } break; case 7: -#line 67 "../../src/hb-buffer-deserialize-json.rl" +#line 67 "hb-buffer-deserialize-json.rl" { if (!parse_int (tok, p, &pos.y_advance)) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" +#line 43 "hb-buffer-deserialize-json.rl" { buffer->add_info (info); if (buffer->in_error) @@ -620,7 +620,7 @@ _resume: *end_ptr = p; } break; -#line 624 "hb-buffer-deserialize-json.hh.tmp" +#line 624 "hb-buffer-deserialize-json.hh" } _again: @@ -632,7 +632,7 @@ _again: _out: {} } -#line 125 "../../src/hb-buffer-deserialize-json.rl" +#line 125 "hb-buffer-deserialize-json.rl" *end_ptr = p; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-json.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-json.rl index 7351b2ab47c..91b350f5ac0 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-json.rl +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-json.rl @@ -117,8 +117,8 @@ _hb_buffer_deserialize_glyphs_json (hb_buffer_t *buffer, const char *tok = NULL; int cs; - hb_glyph_info_t info; - hb_glyph_position_t pos; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; %%{ write init; write exec; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-text.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-text.hh index a38efe3a415..803efbd23b7 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-text.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-text.hh @@ -32,7 +32,7 @@ #include "hb-private.hh" -#line 36 "hb-buffer-deserialize-text.hh.tmp" +#line 36 "../../src/hb-buffer-deserialize-text.hh" static const unsigned char _deserialize_text_trans_keys[] = { 0u, 0u, 9u, 122u, 45u, 57u, 48u, 57u, 45u, 57u, 48u, 57u, 48u, 57u, 45u, 57u, 48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 57u, 9u, 124u, 9u, 124u, 0u, 0u, @@ -339,12 +339,12 @@ _hb_buffer_deserialize_glyphs_text (hb_buffer_t *buffer, hb_glyph_info_t info; hb_glyph_position_t pos; -#line 343 "hb-buffer-deserialize-text.hh.tmp" +#line 343 "../../src/hb-buffer-deserialize-text.hh" { cs = deserialize_text_start; } -#line 348 "hb-buffer-deserialize-text.hh.tmp" +#line 348 "../../src/hb-buffer-deserialize-text.hh" { int _slen; int _trans; @@ -476,7 +476,7 @@ _resume: *end_ptr = p; } break; -#line 480 "hb-buffer-deserialize-text.hh.tmp" +#line 480 "../../src/hb-buffer-deserialize-text.hh" } _again: @@ -553,7 +553,7 @@ _again: *end_ptr = p; } break; -#line 557 "hb-buffer-deserialize-text.hh.tmp" +#line 557 "../../src/hb-buffer-deserialize-text.hh" } } diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-text.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-text.rl index 8856580fbe3..8856580fbe3 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-deserialize-text.rl +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-deserialize-text.rl diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-private.hh index 069f9255811..069f9255811 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-serialize.cc index 406d69db758..406d69db758 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer-serialize.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer-serialize.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer.cc index 74ae273eeca..74ae273eeca 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer.h index 7b0c9204688..7b0c9204688 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-buffer.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-buffer.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-cache-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-cache-private.hh index 19b70b7e395..19b70b7e395 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-cache-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-cache-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-common.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-common.cc index a6a51447941..a6a51447941 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-common.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-common.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-common.h index b6ce3f724de..b6ce3f724de 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-common.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-common.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-coretext.cc index 9097cce9b44..11629cc18ce 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-coretext.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-coretext.cc @@ -327,7 +327,7 @@ struct range_record_t { #define kUpperCaseType 38 /* Table data courtesy of Apple. */ -struct feature_mapping_t { +static const struct feature_mapping_t { FourCharCode otFeatureTag; uint16_t aatFeatureType; uint16_t selectorToEnable; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-coretext.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-coretext.h index 25267bc9784..25267bc9784 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-coretext.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-coretext.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-deprecated.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-deprecated.h index 30ae4b1caf7..30ae4b1caf7 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-deprecated.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-deprecated.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-face-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-face-private.hh index 6520d3dbdff..c4266fff4f0 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-face-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-face-private.hh @@ -66,7 +66,7 @@ struct hb_face_t { { hb_blob_t *blob; - if (unlikely (!this || !reference_table_func)) + if (unlikely (!reference_table_func)) return hb_blob_get_empty (); blob = reference_table_func (/*XXX*/const_cast<hb_face_t *> (this), tag, user_data); diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-face.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-face.cc index 9348af7bf8e..9348af7bf8e 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-face.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-face.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-face.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-face.h index f682c468de5..f682c468de5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-face.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-face.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-fallback-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-fallback-shape.cc index 9d061a9e845..9d061a9e845 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-fallback-shape.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-fallback-shape.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-font-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-font-private.hh index 33bbf7143a2..33bbf7143a2 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-font-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-font-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-font.cc index 4364ca72fb0..4364ca72fb0 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-font.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-font.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-font.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-font.h index 7273db43eda..7273db43eda 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-font.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-font.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ft.cc index 16bf51f569f..c42d484c48b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ft.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ft.cc @@ -136,7 +136,7 @@ hb_ft_get_glyph_v_origin (hb_font_t *font HB_UNUSED, void *user_data HB_UNUSED) { FT_Face ft_face = (FT_Face) font_data; - int load_flags = FT_LOAD_DEFAULT; + int load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING; if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags))) return false; @@ -185,7 +185,7 @@ hb_ft_get_glyph_extents (hb_font_t *font HB_UNUSED, void *user_data HB_UNUSED) { FT_Face ft_face = (FT_Face) font_data; - int load_flags = FT_LOAD_DEFAULT; + int load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING; if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags))) return false; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ft.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ft.h index 696251e143f..696251e143f 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ft.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ft.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-glib.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-glib.cc index af43cab7113..af43cab7113 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-glib.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-glib.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-glib.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-glib.h index 63a9d3366c5..63a9d3366c5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-glib.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-glib.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-enums.cc.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-enums.cc.tmpl index ca458a3846c..ca458a3846c 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-enums.cc.tmpl +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-enums.cc.tmpl diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-enums.h.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-enums.h.tmpl index 6ecda06c2a6..6ecda06c2a6 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-enums.h.tmpl +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-enums.h.tmpl diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-structs.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-structs.cc index 2451b66291b..2451b66291b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-structs.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-structs.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-structs.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-structs.h index 4a88d569e8d..4a88d569e8d 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject-structs.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject-structs.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject.h index ea1bd25df82..ea1bd25df82 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-gobject.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-gobject.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-graphite2.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-graphite2.cc index 807c3308771..807c3308771 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-graphite2.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-graphite2.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-graphite2.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-graphite2.h index 3eae54acbd8..3eae54acbd8 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-graphite2.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-graphite2.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-icu.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-icu.cc index 86c8b5cc5a2..86c8b5cc5a2 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-icu.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-icu.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-icu.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-icu.h index f2f35f0f2ce..f2f35f0f2ce 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-icu.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-icu.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-mutex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-mutex-private.hh index 62812019585..62812019585 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-mutex-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-mutex-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-object-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-object-private.hh index 8a9ae34dbee..7bd0f1624b5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-object-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-object-private.hh @@ -68,8 +68,6 @@ struct hb_reference_count_t #define HB_USER_DATA_ARRAY_INIT {HB_MUTEX_INIT, HB_LOCKABLE_SET_INIT} struct hb_user_data_array_t { - /* TODO Add tracing. */ - struct hb_user_data_item_t { hb_user_data_key_t *key; void *data; @@ -106,69 +104,6 @@ struct hb_object_header_t #define HB_OBJECT_HEADER_STATIC {HB_REFERENCE_COUNT_INVALID, HB_USER_DATA_ARRAY_INIT} - static inline void *create (unsigned int size) { - hb_object_header_t *obj = (hb_object_header_t *) calloc (1, size); - - if (likely (obj)) - obj->init (); - - return obj; - } - - inline void init (void) { - ref_count.init (1); - user_data.init (); - } - - inline bool is_inert (void) const { - return unlikely (ref_count.is_invalid ()); - } - - inline void reference (void) { - if (unlikely (!this || this->is_inert ())) - return; - ref_count.inc (); - } - - inline bool destroy (void) { - if (unlikely (!this || this->is_inert ())) - return false; - if (ref_count.dec () != 1) - return false; - - ref_count.finish (); /* Do this before user_data */ - user_data.finish (); - - return true; - } - - inline bool set_user_data (hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy_func, - hb_bool_t replace) { - if (unlikely (!this || this->is_inert ())) - return false; - - return user_data.set (key, data, destroy_func, replace); - } - - inline void *get_user_data (hb_user_data_key_t *key) { - if (unlikely (!this || this->is_inert ())) - return NULL; - - return user_data.get (key); - } - - inline void trace (const char *function) const { - if (unlikely (!this)) return; - /* TODO We cannot use DEBUG_MSG_FUNC here since that one currently only - * prints the class name and throws away the template info. */ - DEBUG_MSG (OBJECT, (void *) this, - "%s refcount=%d", - function, - this ? ref_count.ref_count : 0); - } - private: ASSERT_POD (); }; @@ -179,32 +114,56 @@ struct hb_object_header_t template <typename Type> static inline void hb_object_trace (const Type *obj, const char *function) { - obj->header.trace (function); + DEBUG_MSG (OBJECT, (void *) obj, + "%s refcount=%d", + function, + obj ? obj->header.ref_count.ref_count : 0); } + template <typename Type> static inline Type *hb_object_create (void) { - Type *obj = (Type *) hb_object_header_t::create (sizeof (Type)); + Type *obj = (Type *) calloc (1, sizeof (Type)); + + if (unlikely (!obj)) + return obj; + + hb_object_init (obj); hb_object_trace (obj, HB_FUNC); return obj; } template <typename Type> +static inline void hb_object_init (Type *obj) +{ + obj->header.ref_count.init (1); + obj->header.user_data.init (); +} +template <typename Type> static inline bool hb_object_is_inert (const Type *obj) { - return unlikely (obj->header.is_inert ()); + return unlikely (obj->header.ref_count.is_invalid ()); } template <typename Type> static inline Type *hb_object_reference (Type *obj) { hb_object_trace (obj, HB_FUNC); - obj->header.reference (); + if (unlikely (!obj || hb_object_is_inert (obj))) + return obj; + obj->header.ref_count.inc (); return obj; } template <typename Type> static inline bool hb_object_destroy (Type *obj) { hb_object_trace (obj, HB_FUNC); - return obj->header.destroy (); + if (unlikely (!obj || hb_object_is_inert (obj))) + return false; + if (obj->header.ref_count.dec () != 1) + return false; + + obj->header.ref_count.finish (); /* Do this before user_data */ + obj->header.user_data.finish (); + return true; } template <typename Type> static inline bool hb_object_set_user_data (Type *obj, @@ -213,14 +172,18 @@ static inline bool hb_object_set_user_data (Type *obj, hb_destroy_func_t destroy, hb_bool_t replace) { - return obj->header.set_user_data (key, data, destroy, replace); + if (unlikely (!obj || hb_object_is_inert (obj))) + return false; + return obj->header.user_data.set (key, data, destroy, replace); } template <typename Type> static inline void *hb_object_get_user_data (Type *obj, hb_user_data_key_t *key) { - return obj->header.get_user_data (key); + if (unlikely (!obj || hb_object_is_inert (obj))) + return NULL; + return obj->header.user_data.get (key); } diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-open-file-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-open-file-private.hh index 57db59db84a..57db59db84a 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-open-file-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-open-file-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-open-type-private.hh index 475187bae31..a58e790e04a 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-open-type-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-open-type-private.hh @@ -533,31 +533,76 @@ template <typename Type> struct BEInt<Type, 2> { public: - inline void set (Type i) { hb_be_uint16_put (v,i); } - inline operator Type (void) const { return hb_be_uint16_get (v); } - inline bool operator == (const BEInt<Type, 2>& o) const { return hb_be_uint16_eq (v, o.v); } + inline void set (Type V) + { + v[0] = (V >> 8) & 0xFF; + v[1] = (V ) & 0xFF; + } + inline operator Type (void) const + { + return (v[0] << 8) + + (v[1] ); + } + inline bool operator == (const BEInt<Type, 2>& o) const + { + return v[0] == o.v[0] + && v[1] == o.v[1]; + } inline bool operator != (const BEInt<Type, 2>& o) const { return !(*this == o); } private: uint8_t v[2]; }; template <typename Type> -struct BEInt<Type, 4> +struct BEInt<Type, 3> { public: - inline void set (Type i) { hb_be_uint32_put (v,i); } - inline operator Type (void) const { return hb_be_uint32_get (v); } - inline bool operator == (const BEInt<Type, 4>& o) const { return hb_be_uint32_eq (v, o.v); } - inline bool operator != (const BEInt<Type, 4>& o) const { return !(*this == o); } - private: uint8_t v[4]; + inline void set (Type V) + { + v[0] = (V >> 16) & 0xFF; + v[1] = (V >> 8) & 0xFF; + v[2] = (V ) & 0xFF; + } + inline operator Type (void) const + { + return (v[0] << 16) + + (v[1] << 8) + + (v[2] ); + } + inline bool operator == (const BEInt<Type, 3>& o) const + { + return v[0] == o.v[0] + && v[1] == o.v[1] + && v[2] == o.v[2]; + } + inline bool operator != (const BEInt<Type, 3>& o) const { return !(*this == o); } + private: uint8_t v[3]; }; template <typename Type> -struct BEInt<Type, 3> +struct BEInt<Type, 4> { public: - inline void set (Type i) { hb_be_uint24_put (v,i); } - inline operator Type (void) const { return hb_be_uint24_get (v); } - inline bool operator == (const BEInt<Type, 3>& o) const { return hb_be_uint24_eq (v, o.v); } - inline bool operator != (const BEInt<Type, 3>& o) const { return !(*this == o); } - private: uint8_t v[3]; + inline void set (Type V) + { + v[0] = (V >> 24) & 0xFF; + v[1] = (V >> 16) & 0xFF; + v[2] = (V >> 8) & 0xFF; + v[3] = (V ) & 0xFF; + } + inline operator Type (void) const + { + return (v[0] << 24) + + (v[1] << 16) + + (v[2] << 8) + + (v[3] ); + } + inline bool operator == (const BEInt<Type, 4>& o) const + { + return v[0] == o.v[0] + && v[1] == o.v[1] + && v[2] == o.v[2] + && v[3] == o.v[3]; + } + inline bool operator != (const BEInt<Type, 4>& o) const { return !(*this == o); } + private: uint8_t v[4]; }; /* Integer types in big-endian order and no alignment requirement */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-cmap-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-cmap-table.hh index d53141157d0..d53141157d0 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-cmap-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-cmap-table.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-font.cc index c9890c59228..2af2f54a759 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-font.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-font.cc @@ -35,17 +35,128 @@ #include "hb-ot-hmtx-table.hh" +struct hb_ot_face_metrics_accelerator_t +{ + unsigned int num_metrics; + unsigned int num_advances; + unsigned int default_advance; + const OT::_mtx *table; + hb_blob_t *blob; + + inline void init (hb_face_t *face, + hb_tag_t _hea_tag, hb_tag_t _mtx_tag, + unsigned int default_advance) + { + this->default_advance = default_advance; + this->num_metrics = face->get_num_glyphs (); + + hb_blob_t *_hea_blob = OT::Sanitizer<OT::_hea>::sanitize (face->reference_table (_hea_tag)); + const OT::_hea *_hea = OT::Sanitizer<OT::_hea>::lock_instance (_hea_blob); + this->num_advances = _hea->numberOfLongMetrics; + hb_blob_destroy (_hea_blob); + + this->blob = OT::Sanitizer<OT::_mtx>::sanitize (face->reference_table (_mtx_tag)); + if (unlikely (!this->num_advances || + 2 * (this->num_advances + this->num_metrics) < hb_blob_get_length (this->blob))) + { + this->num_metrics = this->num_advances = 0; + hb_blob_destroy (this->blob); + this->blob = hb_blob_get_empty (); + } + this->table = OT::Sanitizer<OT::_mtx>::lock_instance (this->blob); + } + + inline void fini (void) + { + hb_blob_destroy (this->blob); + } + + inline unsigned int get_advance (hb_codepoint_t glyph) const + { + if (unlikely (glyph >= this->num_metrics)) + { + /* If this->num_metrics is zero, it means we don't have the metrics table + * for this direction: return one EM. Otherwise, it means that the glyph + * index is out of bound: return zero. */ + if (this->num_metrics) + return 0; + else + return this->default_advance; + } + + if (glyph >= this->num_advances) + glyph = this->num_advances - 1; + + return this->table->longMetric[glyph].advance; + } +}; + +struct hb_ot_face_cmap_accelerator_t +{ + const OT::CmapSubtable *table; + const OT::CmapSubtable *uvs_table; + hb_blob_t *blob; + + inline void init (hb_face_t *face) + { + this->blob = OT::Sanitizer<OT::cmap>::sanitize (face->reference_table (HB_OT_TAG_cmap)); + const OT::cmap *cmap = OT::Sanitizer<OT::cmap>::lock_instance (this->blob); + const OT::CmapSubtable *subtable = NULL; + const OT::CmapSubtable *subtable_uvs = NULL; + + /* 32-bit subtables. */ + if (!subtable) subtable = cmap->find_subtable (3, 10); + if (!subtable) subtable = cmap->find_subtable (0, 6); + if (!subtable) subtable = cmap->find_subtable (0, 4); + /* 16-bit subtables. */ + if (!subtable) subtable = cmap->find_subtable (3, 1); + if (!subtable) subtable = cmap->find_subtable (0, 3); + if (!subtable) subtable = cmap->find_subtable (0, 2); + if (!subtable) subtable = cmap->find_subtable (0, 1); + if (!subtable) subtable = cmap->find_subtable (0, 0); + /* Meh. */ + if (!subtable) subtable = &OT::Null(OT::CmapSubtable); + + /* UVS subtable. */ + if (!subtable_uvs) subtable_uvs = cmap->find_subtable (0, 5); + /* Meh. */ + if (!subtable_uvs) subtable_uvs = &OT::Null(OT::CmapSubtable); + + this->table = subtable; + this->uvs_table = subtable_uvs; + } + + inline void fini (void) + { + hb_blob_destroy (this->blob); + } + + inline bool get_glyph (hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) const + { + if (unlikely (variation_selector)) + { + switch (this->uvs_table->get_glyph_variant (unicode, + variation_selector, + glyph)) + { + case OT::GLYPH_VARIANT_NOT_FOUND: return false; + case OT::GLYPH_VARIANT_FOUND: return true; + case OT::GLYPH_VARIANT_USE_DEFAULT: break; + } + } + + return this->table->get_glyph (unicode, glyph); + } +}; + struct hb_ot_font_t { - unsigned int num_glyphs; - unsigned int num_hmetrics; - const OT::hmtx *hmtx; - hb_blob_t *hmtx_blob; - - const OT::CmapSubtable *cmap; - const OT::CmapSubtable *cmap_uvs; - hb_blob_t *cmap_blob; + hb_ot_face_cmap_accelerator_t cmap; + hb_ot_face_metrics_accelerator_t h_metrics; + hb_ot_face_metrics_accelerator_t v_metrics; }; @@ -53,50 +164,16 @@ static hb_ot_font_t * _hb_ot_font_create (hb_font_t *font) { hb_ot_font_t *ot_font = (hb_ot_font_t *) calloc (1, sizeof (hb_ot_font_t)); + hb_face_t *face = font->face; if (unlikely (!ot_font)) return NULL; - ot_font->num_glyphs = font->face->get_num_glyphs (); + unsigned int upem = face->get_upem (); - { - hb_blob_t *hhea_blob = OT::Sanitizer<OT::hhea>::sanitize (font->face->reference_table (HB_OT_TAG_hhea)); - const OT::hhea *hhea = OT::Sanitizer<OT::hhea>::lock_instance (hhea_blob); - ot_font->num_hmetrics = hhea->numberOfHMetrics; - hb_blob_destroy (hhea_blob); - } - ot_font->hmtx_blob = OT::Sanitizer<OT::hmtx>::sanitize (font->face->reference_table (HB_OT_TAG_hmtx)); - if (unlikely (!ot_font->num_hmetrics || - 2 * (ot_font->num_hmetrics + ot_font->num_glyphs) < hb_blob_get_length (ot_font->hmtx_blob))) - { - hb_blob_destroy (ot_font->hmtx_blob); - free (ot_font); - return NULL; - } - ot_font->hmtx = OT::Sanitizer<OT::hmtx>::lock_instance (ot_font->hmtx_blob); - - ot_font->cmap_blob = OT::Sanitizer<OT::cmap>::sanitize (font->face->reference_table (HB_OT_TAG_cmap)); - const OT::cmap *cmap = OT::Sanitizer<OT::cmap>::lock_instance (ot_font->cmap_blob); - const OT::CmapSubtable *subtable = NULL; - const OT::CmapSubtable *subtable_uvs = NULL; - - /* 32-bit subtables. */ - if (!subtable) subtable = cmap->find_subtable (0, 6); - if (!subtable) subtable = cmap->find_subtable (0, 4); - if (!subtable) subtable = cmap->find_subtable (3, 10); - /* 16-bit subtables. */ - if (!subtable) subtable = cmap->find_subtable (0, 3); - if (!subtable) subtable = cmap->find_subtable (3, 1); - /* Meh. */ - if (!subtable) subtable = &OT::Null(OT::CmapSubtable); - - /* UVS subtable. */ - if (!subtable_uvs) subtable_uvs = cmap->find_subtable (0, 5); - /* Meh. */ - if (!subtable_uvs) subtable_uvs = &OT::Null(OT::CmapSubtable); - - ot_font->cmap = subtable; - ot_font->cmap_uvs = subtable_uvs; + ot_font->cmap.init (face); + ot_font->h_metrics.init (face, HB_OT_TAG_hhea, HB_OT_TAG_hmtx, upem>>1); + ot_font->v_metrics.init (face, HB_OT_TAG_vhea, HB_OT_TAG_vmtx, upem); /* TODO Can we do this lazily? */ return ot_font; } @@ -104,8 +181,9 @@ _hb_ot_font_create (hb_font_t *font) static void _hb_ot_font_destroy (hb_ot_font_t *ot_font) { - hb_blob_destroy (ot_font->cmap_blob); - hb_blob_destroy (ot_font->hmtx_blob); + ot_font->cmap.fini (); + ot_font->h_metrics.fini (); + ot_font->v_metrics.fini (); free (ot_font); } @@ -121,20 +199,7 @@ hb_ot_get_glyph (hb_font_t *font HB_UNUSED, { const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; - - if (unlikely (variation_selector)) - { - switch (ot_font->cmap_uvs->get_glyph_variant (unicode, - variation_selector, - glyph)) - { - case OT::GLYPH_VARIANT_NOT_FOUND: return false; - case OT::GLYPH_VARIANT_FOUND: return true; - case OT::GLYPH_VARIANT_USE_DEFAULT: break; - } - } - - return ot_font->cmap->get_glyph (unicode, glyph); + return ot_font->cmap.get_glyph (unicode, variation_selector, glyph); } static hb_position_t @@ -144,14 +209,7 @@ hb_ot_get_glyph_h_advance (hb_font_t *font HB_UNUSED, void *user_data HB_UNUSED) { const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; - - if (unlikely (glyph >= ot_font->num_glyphs)) - return 0; /* Maybe better to return notdef's advance instead? */ - - if (glyph >= ot_font->num_hmetrics) - glyph = ot_font->num_hmetrics - 1; - - return font->em_scale_x (ot_font->hmtx->longHorMetric[glyph].advanceWidth); + return font->em_scale_x (ot_font->h_metrics.get_advance (glyph)); } static hb_position_t @@ -160,8 +218,8 @@ hb_ot_get_glyph_v_advance (hb_font_t *font HB_UNUSED, hb_codepoint_t glyph, void *user_data HB_UNUSED) { - /* TODO */ - return 0; + const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; + return font->em_scale_y (-ot_font->v_metrics.get_advance (glyph)); } static hb_bool_t @@ -206,6 +264,7 @@ hb_ot_get_glyph_v_kerning (hb_font_t *font HB_UNUSED, hb_codepoint_t bottom_glyph HB_UNUSED, void *user_data HB_UNUSED) { + /* OpenType doesn't have vertical-kerning other than GPOS. */ return 0; } diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-font.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-font.h index 7a8c04ac33d..7a8c04ac33d 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-font.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-font.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-head-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-head-table.hh index ec4e8c9d453..ec4e8c9d453 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-head-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-head-table.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-hhea-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-hhea-table.hh index d433200165c..6bf6d5f5f53 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-hhea-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-hhea-table.hh @@ -35,14 +35,17 @@ namespace OT { /* * hhea -- The Horizontal Header Table + * vhea -- The Vertical Header Table */ #define HB_OT_TAG_hhea HB_TAG('h','h','e','a') +#define HB_OT_TAG_vhea HB_TAG('v','h','e','a') -struct hhea +struct _hea { - static const hb_tag_t tableTag = HB_OT_TAG_hhea; + static const hb_tag_t hheaTag = HB_OT_TAG_hhea; + static const hb_tag_t vheaTag = HB_OT_TAG_vhea; inline bool sanitize (hb_sanitize_context_t *c) { TRACE_SANITIZE (this); @@ -51,45 +54,45 @@ struct hhea public: FixedVersion version; /* 0x00010000u for version 1.0. */ - FWORD ascender; /* Typographic ascent. <a - * href="http://developer.apple.com/fonts/TTRefMan/RM06/Chap6hhea.html"> - * (Distance from baseline of highest - * ascender)</a> */ - FWORD descender; /* Typographic descent. <a - * href="http://developer.apple.com/fonts/TTRefMan/RM06/Chap6hhea.html"> - * (Distance from baseline of lowest - * descender)</a> */ - FWORD lineGap; /* Typographic line gap. Negative - * LineGap values are treated as zero - * in Windows 3.1, System 6, and - * System 7. */ - UFWORD advanceWidthMax; /* Maximum advance width value in - * 'hmtx' table. */ - FWORD minLeftSideBearing; /* Minimum left sidebearing value in - * 'hmtx' table. */ - FWORD minRightSideBearing; /* Minimum right sidebearing value; + FWORD ascender; /* Typographic ascent. */ + FWORD descender; /* Typographic descent. */ + FWORD lineGap; /* Typographic line gap. */ + UFWORD advanceMax; /* Maximum advance width/height value in + * metrics table. */ + FWORD minLeadingBearing; /* Minimum left/top sidebearing value in + * metrics table. */ + FWORD minTrailingBearing; /* Minimum right/bottom sidebearing value; * calculated as Min(aw - lsb - - * (xMax - xMin)). */ - FWORD xMaxExtent; /* Max(lsb + (xMax - xMin)). */ + * (xMax - xMin)) for horizontal. */ + FWORD maxExtent; /* horizontal: Max(lsb + (xMax - xMin)), + * vertical: minLeadingBearing+(yMax-yMin). */ SHORT caretSlopeRise; /* Used to calculate the slope of the - * cursor (rise/run); 1 for vertical. */ - SHORT caretSlopeRun; /* 0 for vertical. */ + * cursor (rise/run); 1 for vertical caret, + * 0 for horizontal.*/ + SHORT caretSlopeRun; /* 0 for vertical caret, 1 for horizontal. */ SHORT caretOffset; /* The amount by which a slanted * highlight on a glyph needs * to be shifted to produce the * best appearance. Set to 0 for - * non--slanted fonts */ - SHORT reserved1; /* set to 0 */ - SHORT reserved2; /* set to 0 */ - SHORT reserved3; /* set to 0 */ - SHORT reserved4; /* set to 0 */ + * non-slanted fonts. */ + SHORT reserved1; /* Set to 0. */ + SHORT reserved2; /* Set to 0. */ + SHORT reserved3; /* Set to 0. */ + SHORT reserved4; /* Set to 0. */ SHORT metricDataFormat; /* 0 for current format. */ - USHORT numberOfHMetrics; /* Number of hMetric entries in 'hmtx' - * table */ + USHORT numberOfLongMetrics; /* Number of LongMetric entries in metric + * table. */ public: DEFINE_SIZE_STATIC (36); }; +struct hhea : _hea { + static const hb_tag_t tableTag = HB_OT_TAG_hhea; +}; +struct vhea : _hea { + static const hb_tag_t tableTag = HB_OT_TAG_vhea; +}; + } /* namespace OT */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-hmtx-table.hh index e918e3b3f40..932f9730118 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-hmtx-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-hmtx-table.hh @@ -35,22 +35,25 @@ namespace OT { /* * hmtx -- The Horizontal Metrics Table + * vmtx -- The Vertical Metrics Table */ #define HB_OT_TAG_hmtx HB_TAG('h','m','t','x') +#define HB_OT_TAG_vmtx HB_TAG('v','m','t','x') -struct LongHorMetric +struct LongMetric { - USHORT advanceWidth; - SHORT lsb; + USHORT advance; /* Advance width/height. */ + SHORT lsb; /* Leading (left/top) side bearing. */ public: DEFINE_SIZE_STATIC (4); }; -struct hmtx +struct _mtx { - static const hb_tag_t tableTag = HB_OT_TAG_hmtx; + static const hb_tag_t hmtxTag = HB_OT_TAG_hmtx; + static const hb_tag_t vmtxTag = HB_OT_TAG_vmtx; inline bool sanitize (hb_sanitize_context_t *c) { TRACE_SANITIZE (this); @@ -60,7 +63,7 @@ struct hmtx } public: - LongHorMetric longHorMetric[VAR]; /* Paired advance width and left side + LongMetric longMetric[VAR]; /* Paired advance width and leading * bearing values for each glyph. The * value numOfHMetrics comes from * the 'hhea' table. If the font is @@ -68,23 +71,29 @@ struct hmtx * be in the array, but that entry is * required. The last entry applies to * all subsequent glyphs. */ - SHORT leftSideBearingX[VAR]; /* Here the advanceWidth is assumed - * to be the same as the advanceWidth + SHORT leadingBearingX[VAR]; /* Here the advance is assumed + * to be the same as the advance * for the last entry above. The * number of entries in this array is * derived from numGlyphs (from 'maxp' - * table) minus numberOfHMetrics. This - * generally is used with a run of - * monospaced glyphs (e.g., Kanji + * table) minus numberOfLongMetrics. + * This generally is used with a run + * of monospaced glyphs (e.g., Kanji * fonts or Courier fonts). Only one * run is allowed and it must be at * the end. This allows a monospaced - * font to vary the left side bearing + * font to vary the side bearing * values for each glyph. */ public: - DEFINE_SIZE_ARRAY2 (0, longHorMetric, leftSideBearingX); + DEFINE_SIZE_ARRAY2 (0, longMetric, leadingBearingX); }; +struct hmtx : _mtx { + static const hb_tag_t tableTag = HB_OT_TAG_hmtx; +}; +struct vmtx : _mtx { + static const hb_tag_t tableTag = HB_OT_TAG_vmtx; +}; } /* namespace OT */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-common-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-common-private.hh index abd063c8961..abd063c8961 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-common-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-common-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gdef-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gdef-table.hh index 84a5e797c63..84a5e797c63 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gdef-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gdef-table.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gpos-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gpos-table.hh index 8e2860c9131..8e2860c9131 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gpos-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gpos-table.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gsub-table.hh index 2b421a94f54..7d6a5a779d7 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gsub-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gsub-table.hh @@ -200,7 +200,7 @@ struct SingleSubst TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (u.format))) return TRACE_RETURN (false); unsigned int format = 2; - int delta; + int delta = 0; if (num_glyphs) { format = 1; /* TODO(serialize) check for wrap-around */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gsubgpos-private.hh index 546ff4b0fde..710687081b6 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-gsubgpos-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-gsubgpos-private.hh @@ -168,6 +168,10 @@ struct hb_collect_glyphs_context_t if (output == hb_set_get_empty ()) return HB_VOID; + /* Return if new lookup was recursed to before. */ + if (recursed_lookups.has (lookup_index)) + return HB_VOID; + hb_set_t *old_before = before; hb_set_t *old_input = input; hb_set_t *old_after = after; @@ -181,6 +185,8 @@ struct hb_collect_glyphs_context_t input = old_input; after = old_after; + recursed_lookups.add (lookup_index); + return HB_VOID; } @@ -190,6 +196,7 @@ struct hb_collect_glyphs_context_t hb_set_t *after; hb_set_t *output; recurse_func_t recurse_func; + hb_set_t recursed_lookups; unsigned int nesting_level_left; unsigned int debug_depth; @@ -205,8 +212,16 @@ struct hb_collect_glyphs_context_t after (glyphs_after ? glyphs_after : hb_set_get_empty ()), output (glyphs_output ? glyphs_output : hb_set_get_empty ()), recurse_func (NULL), + recursed_lookups (), nesting_level_left (nesting_level_left_), - debug_depth (0) {} + debug_depth (0) + { + recursed_lookups.init (); + } + ~hb_collect_glyphs_context_t (void) + { + recursed_lookups.fini (); + } void set_recurse_func (recurse_func_t func) { recurse_func = func; } }; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-jstf-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-jstf-table.hh index 67a6df5b421..67a6df5b421 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-jstf-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-jstf-table.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-private.hh index ae7daa6dbc9..ae7daa6dbc9 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout.cc index 661d90ea0d6..661d90ea0d6 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout.h index 949678ac422..949678ac422 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-layout.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-layout.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-map-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-map-private.hh index 86b7e9fafea..86b7e9fafea 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-map-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-map-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-map.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-map.cc index 4985eb22b20..4985eb22b20 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-map.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-map.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-maxp-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-maxp-table.hh index b1f832852d3..b1f832852d3 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-maxp-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-maxp-table.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-name-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-name-table.hh index 31d9fac7e29..31d9fac7e29 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-name-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-name-table.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic-fallback.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic-fallback.hh index e5b7ed489c0..dc659e084c5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic-fallback.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic-fallback.hh @@ -207,7 +207,7 @@ struct arabic_fallback_plan_t static const arabic_fallback_plan_t arabic_fallback_plan_nil = {}; -#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(HB_WITH_WIN1256) +#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(HB_NO_WIN1256) #define HB_WITH_WIN1256 #endif diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic-table.hh index 17100497ecb..17100497ecb 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic-table.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic-win1256.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic-win1256.hh index 63ed3f8e0ef..3a20b507d4e 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic-win1256.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic-win1256.hh @@ -313,8 +313,11 @@ OT_TABLE_END /* * Include a second time to get the table data... */ +#if 0 +#include "hb-private.hh" /* Make check-includes.sh happy. */ +#endif #ifdef OT_MEASURE -#include __FILE__ +#include "hb-ot-shape-complex-arabic-win1256.hh" #endif #define HB_OT_SHAPE_COMPLEX_ARABIC_WIN1256_HH diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic.cc index ae908641271..ae908641271 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-arabic.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-arabic.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-default.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-default.cc index f7f097eedaa..f7f097eedaa 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-default.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-default.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-hangul.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-hangul.cc index 6ac18b08bff..6ac18b08bff 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-hangul.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-hangul.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-hebrew.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-hebrew.cc index c7b7a5eba6a..c7b7a5eba6a 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-hebrew.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-hebrew.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-machine.hh index 5fbdcc8366e..522ccc67fee 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-machine.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-machine.hh @@ -1,5 +1,5 @@ -#line 1 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 1 "hb-ot-shape-complex-indic-machine.rl" /* * Copyright © 2011,2012 Google, Inc. * @@ -32,7 +32,7 @@ #include "hb-private.hh" -#line 36 "../../src/hb-ot-shape-complex-indic-machine.hh.tmp" +#line 36 "hb-ot-shape-complex-indic-machine.hh" static const unsigned char _indic_syllable_machine_trans_keys[] = { 1u, 16u, 13u, 13u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 4u, 4u, 6u, 6u, @@ -1526,11 +1526,11 @@ static const int indic_syllable_machine_error = -1; static const int indic_syllable_machine_en_main = 170; -#line 36 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 36 "hb-ot-shape-complex-indic-machine.rl" -#line 97 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 97 "hb-ot-shape-complex-indic-machine.rl" #define found_syllable(syllable_type) \ @@ -1550,7 +1550,7 @@ find_syllables (hb_buffer_t *buffer) int cs; hb_glyph_info_t *info = buffer->info; -#line 1554 "../../src/hb-ot-shape-complex-indic-machine.hh.tmp" +#line 1554 "hb-ot-shape-complex-indic-machine.hh" { cs = indic_syllable_machine_start; ts = 0; @@ -1558,7 +1558,7 @@ find_syllables (hb_buffer_t *buffer) act = 0; } -#line 118 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 118 "hb-ot-shape-complex-indic-machine.rl" p = 0; @@ -1567,7 +1567,7 @@ find_syllables (hb_buffer_t *buffer) unsigned int last = 0; unsigned int syllable_serial = 1; -#line 1571 "../../src/hb-ot-shape-complex-indic-machine.hh.tmp" +#line 1571 "hb-ot-shape-complex-indic-machine.hh" { int _slen; int _trans; @@ -1581,7 +1581,7 @@ _resume: #line 1 "NONE" {ts = p;} break; -#line 1585 "../../src/hb-ot-shape-complex-indic-machine.hh.tmp" +#line 1585 "hb-ot-shape-complex-indic-machine.hh" } _keys = _indic_syllable_machine_trans_keys + (cs<<1); @@ -1604,67 +1604,67 @@ _eof_trans: {te = p+1;} break; case 14: -#line 88 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 88 "hb-ot-shape-complex-indic-machine.rl" {te = p+1;{ found_syllable (consonant_syllable); }} break; case 16: -#line 89 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 89 "hb-ot-shape-complex-indic-machine.rl" {te = p+1;{ found_syllable (vowel_syllable); }} break; case 21: -#line 90 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 90 "hb-ot-shape-complex-indic-machine.rl" {te = p+1;{ found_syllable (standalone_cluster); }} break; case 23: -#line 91 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 91 "hb-ot-shape-complex-indic-machine.rl" {te = p+1;{ found_syllable (symbol_cluster); }} break; case 18: -#line 92 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 92 "hb-ot-shape-complex-indic-machine.rl" {te = p+1;{ found_syllable (broken_cluster); }} break; case 11: -#line 93 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 93 "hb-ot-shape-complex-indic-machine.rl" {te = p+1;{ found_syllable (non_indic_cluster); }} break; case 13: -#line 88 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 88 "hb-ot-shape-complex-indic-machine.rl" {te = p;p--;{ found_syllable (consonant_syllable); }} break; case 15: -#line 89 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 89 "hb-ot-shape-complex-indic-machine.rl" {te = p;p--;{ found_syllable (vowel_syllable); }} break; case 20: -#line 90 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 90 "hb-ot-shape-complex-indic-machine.rl" {te = p;p--;{ found_syllable (standalone_cluster); }} break; case 22: -#line 91 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 91 "hb-ot-shape-complex-indic-machine.rl" {te = p;p--;{ found_syllable (symbol_cluster); }} break; case 17: -#line 92 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 92 "hb-ot-shape-complex-indic-machine.rl" {te = p;p--;{ found_syllable (broken_cluster); }} break; case 19: -#line 93 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 93 "hb-ot-shape-complex-indic-machine.rl" {te = p;p--;{ found_syllable (non_indic_cluster); }} break; case 1: -#line 88 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 88 "hb-ot-shape-complex-indic-machine.rl" {{p = ((te))-1;}{ found_syllable (consonant_syllable); }} break; case 3: -#line 89 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 89 "hb-ot-shape-complex-indic-machine.rl" {{p = ((te))-1;}{ found_syllable (vowel_syllable); }} break; case 7: -#line 90 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 90 "hb-ot-shape-complex-indic-machine.rl" {{p = ((te))-1;}{ found_syllable (standalone_cluster); }} break; case 4: -#line 92 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 92 "hb-ot-shape-complex-indic-machine.rl" {{p = ((te))-1;}{ found_syllable (broken_cluster); }} break; case 5: @@ -1685,22 +1685,22 @@ _eof_trans: case 8: #line 1 "NONE" {te = p+1;} -#line 88 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 88 "hb-ot-shape-complex-indic-machine.rl" {act = 1;} break; case 6: #line 1 "NONE" {te = p+1;} -#line 92 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 92 "hb-ot-shape-complex-indic-machine.rl" {act = 5;} break; case 12: #line 1 "NONE" {te = p+1;} -#line 93 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 93 "hb-ot-shape-complex-indic-machine.rl" {act = 6;} break; -#line 1704 "../../src/hb-ot-shape-complex-indic-machine.hh.tmp" +#line 1704 "hb-ot-shape-complex-indic-machine.hh" } _again: @@ -1709,7 +1709,7 @@ _again: #line 1 "NONE" {ts = 0;} break; -#line 1713 "../../src/hb-ot-shape-complex-indic-machine.hh.tmp" +#line 1713 "hb-ot-shape-complex-indic-machine.hh" } if ( ++p != pe ) @@ -1725,7 +1725,7 @@ _again: } -#line 127 "../../src/hb-ot-shape-complex-indic-machine.rl" +#line 127 "hb-ot-shape-complex-indic-machine.rl" } diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-machine.rl index f6768a581f2..f6768a581f2 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-machine.rl +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-machine.rl diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-private.hh index d8dfc6507d9..d8dfc6507d9 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-table.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-table.cc index f58380e0c8a..f58380e0c8a 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic-table.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic-table.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic.cc index 7723600410a..7723600410a 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-indic.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-indic.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-myanmar-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-myanmar-machine.hh index bb80d7a705d..83ade212235 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-myanmar-machine.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-myanmar-machine.hh @@ -32,7 +32,7 @@ #include "hb-private.hh" -#line 36 "hb-ot-shape-complex-myanmar-machine.hh.tmp" +#line 36 "../../src/hb-ot-shape-complex-myanmar-machine.hh" static const unsigned char _myanmar_syllable_machine_trans_keys[] = { 1u, 31u, 3u, 30u, 5u, 29u, 5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 16u, 3u, 29u, 3u, 29u, 3u, 29u, @@ -285,7 +285,7 @@ find_syllables (hb_buffer_t *buffer) int cs; hb_glyph_info_t *info = buffer->info; -#line 289 "hb-ot-shape-complex-myanmar-machine.hh.tmp" +#line 289 "../../src/hb-ot-shape-complex-myanmar-machine.hh" { cs = myanmar_syllable_machine_start; ts = 0; @@ -302,7 +302,7 @@ find_syllables (hb_buffer_t *buffer) unsigned int last = 0; unsigned int syllable_serial = 1; -#line 306 "hb-ot-shape-complex-myanmar-machine.hh.tmp" +#line 306 "../../src/hb-ot-shape-complex-myanmar-machine.hh" { int _slen; int _trans; @@ -316,7 +316,7 @@ _resume: #line 1 "NONE" {ts = p;} break; -#line 320 "hb-ot-shape-complex-myanmar-machine.hh.tmp" +#line 320 "../../src/hb-ot-shape-complex-myanmar-machine.hh" } _keys = _myanmar_syllable_machine_trans_keys + (cs<<1); @@ -366,7 +366,7 @@ _eof_trans: #line 89 "../../src/hb-ot-shape-complex-myanmar-machine.rl" {te = p;p--;{ found_syllable (non_myanmar_cluster); }} break; -#line 370 "hb-ot-shape-complex-myanmar-machine.hh.tmp" +#line 370 "../../src/hb-ot-shape-complex-myanmar-machine.hh" } _again: @@ -375,7 +375,7 @@ _again: #line 1 "NONE" {ts = 0;} break; -#line 379 "hb-ot-shape-complex-myanmar-machine.hh.tmp" +#line 379 "../../src/hb-ot-shape-complex-myanmar-machine.hh" } if ( ++p != pe ) diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-myanmar-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-myanmar-machine.rl index 9649a916f02..9649a916f02 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-myanmar-machine.rl +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-myanmar-machine.rl diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-myanmar.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-myanmar.cc index d016380cc63..d016380cc63 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-myanmar.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-myanmar.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-private.hh index 9a7afcbd7b1..9a7afcbd7b1 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-sea-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-sea-machine.hh index 86b7ae7d5ca..789e4d60e1d 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-sea-machine.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-sea-machine.hh @@ -32,7 +32,7 @@ #include "hb-private.hh" -#line 36 "hb-ot-shape-complex-sea-machine.hh.tmp" +#line 36 "../../src/hb-ot-shape-complex-sea-machine.hh" static const unsigned char _sea_syllable_machine_trans_keys[] = { 1u, 1u, 1u, 1u, 1u, 29u, 3u, 29u, 3u, 29u, 1u, 1u, 0 }; @@ -113,7 +113,7 @@ find_syllables (hb_buffer_t *buffer) int cs; hb_glyph_info_t *info = buffer->info; -#line 117 "hb-ot-shape-complex-sea-machine.hh.tmp" +#line 117 "../../src/hb-ot-shape-complex-sea-machine.hh" { cs = sea_syllable_machine_start; ts = 0; @@ -130,7 +130,7 @@ find_syllables (hb_buffer_t *buffer) unsigned int last = 0; unsigned int syllable_serial = 1; -#line 134 "hb-ot-shape-complex-sea-machine.hh.tmp" +#line 134 "../../src/hb-ot-shape-complex-sea-machine.hh" { int _slen; int _trans; @@ -144,7 +144,7 @@ _resume: #line 1 "NONE" {ts = p;} break; -#line 148 "hb-ot-shape-complex-sea-machine.hh.tmp" +#line 148 "../../src/hb-ot-shape-complex-sea-machine.hh" } _keys = _sea_syllable_machine_trans_keys + (cs<<1); @@ -190,7 +190,7 @@ _eof_trans: #line 62 "../../src/hb-ot-shape-complex-sea-machine.rl" {{p = ((te))-1;}{ found_syllable (broken_cluster); }} break; -#line 194 "hb-ot-shape-complex-sea-machine.hh.tmp" +#line 194 "../../src/hb-ot-shape-complex-sea-machine.hh" } _again: @@ -199,7 +199,7 @@ _again: #line 1 "NONE" {ts = 0;} break; -#line 203 "hb-ot-shape-complex-sea-machine.hh.tmp" +#line 203 "../../src/hb-ot-shape-complex-sea-machine.hh" } if ( ++p != pe ) diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-sea-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-sea-machine.rl index 46140fc4d5f..46140fc4d5f 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-sea-machine.rl +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-sea-machine.rl diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-sea.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-sea.cc index f08b7ccb9f4..f08b7ccb9f4 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-sea.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-sea.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-thai.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-thai.cc index feb7fc7a148..feb7fc7a148 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-thai.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-thai.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-tibetan.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-tibetan.cc index 01465a426f8..01465a426f8 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-complex-tibetan.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-complex-tibetan.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-fallback-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-fallback-private.hh index ec653513f1b..ec653513f1b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-fallback-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-fallback-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-fallback.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-fallback.cc index 80d7da82f38..80d7da82f38 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-fallback.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-fallback.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-normalize-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-normalize-private.hh index c744e26451d..c744e26451d 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-normalize-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-normalize-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-normalize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-normalize.cc index 4287253aed1..4287253aed1 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-normalize.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-normalize.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-private.hh index 54ac2c3cf7c..54ac2c3cf7c 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape.cc index a0b503ab0f2..a0b503ab0f2 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape.h index 1402f54acc5..1402f54acc5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-shape.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-shape.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-tag.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-tag.cc index 878dd79b62c..878dd79b62c 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-tag.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-tag.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-tag.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-tag.h index 1bf12ab3c09..1bf12ab3c09 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot-tag.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot-tag.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot.h index 47c92a58e4b..47c92a58e4b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ot.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ot.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-private.hh index 80fd6c473c7..cd02e2b30eb 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-private.hh @@ -128,8 +128,12 @@ # ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0600 # endif -# define WIN32_LEAN_AND_MEAN -# define STRICT +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN 1 +# endif +# ifndef STRICT +# define STRICT 1 +# endif #endif #ifdef _WIN32_WCE @@ -535,47 +539,6 @@ struct hb_lockable_set_t }; - - -/* Big-endian handling */ - -static inline uint16_t hb_be_uint16 (const uint16_t v) -{ - const uint8_t *V = (const uint8_t *) &v; - return (V[0] << 8) | V[1]; -} - -static inline uint16_t hb_uint16_swap (const uint16_t v) -{ - return (v >> 8) | (v << 8); -} - -static inline uint32_t hb_uint32_swap (const uint32_t v) -{ - return (hb_uint16_swap (v) << 16) | hb_uint16_swap (v >> 16); -} - -/* Note, of the following macros, uint16_get is the one called many many times. - * If there is any optimizations to be done, it's in that macro. However, I - * already confirmed that on my T400 ThinkPad at least, using bswap_16(), which - * results in a single ror instruction, does NOT speed this up. In fact, it - * resulted in a minor slowdown. At any rate, note that v may not be correctly - * aligned, so I think the current implementation is optimal. - */ - -#define hb_be_uint16_put(v,V) HB_STMT_START { v[0] = (V>>8); v[1] = (V); } HB_STMT_END -#define hb_be_uint16_get(v) (uint16_t) ((v[0] << 8) + v[1]) -#define hb_be_uint16_eq(a,b) (a[0] == b[0] && a[1] == b[1]) - -#define hb_be_uint32_put(v,V) HB_STMT_START { v[0] = (V>>24); v[1] = (V>>16); v[2] = (V>>8); v[3] = (V); } HB_STMT_END -#define hb_be_uint32_get(v) (uint32_t) ((v[0] << 24) + (v[1] << 16) + (v[2] << 8) + v[3]) -#define hb_be_uint32_eq(a,b) (a[0] == b[0] && a[1] == b[1] && a[2] == b[2] && a[3] == b[3]) - -#define hb_be_uint24_put(v,V) HB_STMT_START { v[0] = (V>>16); v[1] = (V>>8); v[2] = (V); } HB_STMT_END -#define hb_be_uint24_get(v) (uint32_t) ((v[0] << 16) + (v[1] << 8) + v[2]) -#define hb_be_uint24_eq(a,b) (a[0] == b[0] && a[1] == b[1] && a[2] == b[2]) - - /* ASCII tag/character handling */ static inline bool ISALPHA (unsigned char c) @@ -885,7 +848,7 @@ hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2, T lo3, T hi3) #define FLAG_RANGE(x,y) (ASSERT_STATIC_EXPR_ZERO ((x) < (y)) + FLAG(y+1) - FLAG(x)) -template <typename T, typename T2> inline void +template <typename T, typename T2> static inline void hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *), T2 *array2) { if (unlikely (!len)) @@ -918,7 +881,7 @@ hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *), } while (k); } -template <typename T> inline void +template <typename T> static inline void hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *)) { hb_bubble_sort (array, len, compar, (int *) NULL); @@ -947,12 +910,12 @@ hb_codepoint_parse (const char *s, unsigned int len, int base, hb_codepoint_t *o struct hb_options_t { - int initialized : 1; - int uniscribe_bug_compatible : 1; + unsigned int initialized : 1; + unsigned int uniscribe_bug_compatible : 1; }; union hb_options_union_t { - int i; + unsigned int i; hb_options_t opts; }; ASSERT_STATIC (sizeof (int) == sizeof (hb_options_union_t)); diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-set-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-set-private.hh index 705f554ce69..59e8f4559f5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-set-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-set-private.hh @@ -150,7 +150,7 @@ struct hb_set_t bool in_error; inline void init (void) { - header.init (); + hb_object_init (this); clear (); } inline void fini (void) { diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-set.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-set.cc index 59a0af46ed4..59a0af46ed4 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-set.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-set.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-set.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-set.h index bafdae96333..bafdae96333 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-set.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-set.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape-plan-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape-plan-private.hh index 607da5e7791..607da5e7791 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape-plan-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape-plan-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape-plan.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape-plan.cc index 2166173f9e5..2166173f9e5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape-plan.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape-plan.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape-plan.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape-plan.h index 8f54552f90b..8f54552f90b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape-plan.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape-plan.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape.cc index 74747f88b89..74747f88b89 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape.h index 10a35cb517e..10a35cb517e 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shape.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shape.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper-impl-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper-impl-private.hh index 7844081e95b..7844081e95b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper-impl-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper-impl-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper-list.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper-list.hh index 6c537d49215..6c537d49215 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper-list.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper-list.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper-private.hh index 29c4493943d..29c4493943d 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper.cc index 6ae26013821..6ae26013821 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-shaper.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-shaper.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ucdn.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ucdn.cc index 5b53821f923..5b53821f923 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-ucdn.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-ucdn.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-unicode-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-unicode-private.hh index a2c59da274a..a2c59da274a 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-unicode-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-unicode-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-unicode.cc index d59dfb24572..d59dfb24572 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-unicode.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-unicode.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-unicode.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-unicode.h index 1c4e097b92d..1c4e097b92d 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-unicode.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-unicode.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-uniscribe.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-uniscribe.cc index 74ae3a39481..e7bcad2ea86 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-uniscribe.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-uniscribe.cc @@ -43,6 +43,12 @@ #endif +static inline uint16_t hb_uint16_swap (const uint16_t v) +{ return (v >> 8) | (v << 8); } +static inline uint32_t hb_uint32_swap (const uint32_t v) +{ return (hb_uint16_swap (v) << 16) | hb_uint16_swap (v >> 16); } + + typedef HRESULT (WINAPI *SIOT) /*ScriptItemizeOpenType*/( const WCHAR *pwcInChars, int cInChars, diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-uniscribe.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-uniscribe.h index 001ab38ea87..001ab38ea87 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-uniscribe.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-uniscribe.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-utf-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-utf-private.hh index 0b798a05c30..0b798a05c30 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-utf-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-utf-private.hh diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-version.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-version.h.in index 2517160d18b..2517160d18b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-version.h.in +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-version.h.in diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-warning.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-warning.cc index e0f88e2d4ad..e0f88e2d4ad 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb-warning.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb-warning.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb.h index c5a938a3818..c5a938a3818 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/hb.h +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/hb.h diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/main.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/main.cc index f9708cc948e..f9708cc948e 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/main.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/main.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test-buffer-serialize.cc index 18c46e9524b..18c46e9524b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test-buffer-serialize.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test-buffer-serialize.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test-size-params.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test-size-params.cc index 35d9e3c8e25..35d9e3c8e25 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test-size-params.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test-size-params.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test-would-substitute.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test-would-substitute.cc index 8ea87cdf397..8ea87cdf397 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test-would-substitute.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test-would-substitute.cc diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test.cc index a8fe046f34c..a8fe046f34c 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.35/src/test.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.36/src/test.cc diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac index cb9d1b839bf..2465ecc6d39 100644 --- a/Build/source/libs/harfbuzz/version.ac +++ b/Build/source/libs/harfbuzz/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current harfbuzz version -m4_define([harfbuzz_version], [0.9.35]) +m4_define([harfbuzz_version], [0.9.36]) |